Skip to content

Commit

Permalink
minor log stuff and cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
pliablepixels committed Dec 26, 2017
1 parent 04baae7 commit d77d5e2
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
Binary file modified resources/.DS_Store
Binary file not shown.
8 changes: 4 additions & 4 deletions www/js/EventCtrl.js
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ angular.module('zmApp.controllers')
if ($rootScope.toString)
nolangTo = moment($rootScope.toString).locale('en').format("YYYY-MM-DD HH:mm:ss");

// console.log ("GETTING EVENTS USING "+$scope.id+" "+nolangFrom+" "+ nolangTo)
//NVRDataModel.debug ("GETTING EVENTS USING "+$scope.id+" "+nolangFrom+" "+ nolangTo);
NVRDataModel.getEventsPages($scope.id, nolangFrom, nolangTo)
.then(function(data)
{
Expand Down Expand Up @@ -520,13 +520,13 @@ angular.module('zmApp.controllers')
if (idfound)
{

//console.log ("PUSHING "+JSON.stringify(myevents[i]));
//NVRDataModel.debug ("PUSHING "+JSON.stringify(myevents[i]));
$scope.events.push(myevents[i]);
//console.log ("SCOPE EVENTS LEN="+$scope.events.length);
}
else
{
console.log ("Skipping Event MID = " + myevents[i].Event.MonitorId);
//NVRDataModel.debug ("Skipping Event MID = " + myevents[i].Event.MonitorId);
}

} //for
Expand Down Expand Up @@ -1203,7 +1203,7 @@ angular.module('zmApp.controllers')

//----------------------------------------------------------
// create an array of images
// too keep memory manageable, we are only going to pick up alarmed frames
// to keep memory manageable, we are only going to pick up alarmed frames
// and that too, max 1ps
// --------------------------------------------------------------
function prepareImages(e)
Expand Down
2 changes: 1 addition & 1 deletion www/templates/events.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</ion-nav-buttons>
<ion-nav-buttons side="right">
<a style="" class="button button-icon icon ion-android-more-vertical" ng-click="popover.show($event)" ;>&nbsp;&nbsp;&nbsp;</a>
<a style="" class="button button-icon icon ion-search" ng-href="" ng-click="searchClicked();"> </a>
<a class="button button-icon icon ion-search" ng-href="" ng-click="searchClicked();"> </a>
</ion-nav-buttons>
<div ng-if="showSearch">
<ion-header-bar class="bar bar-subheader item-input-inset">
Expand Down

0 comments on commit d77d5e2

Please sign in to comment.