v.2.27

Fixed reports

web/views/dashboard/dashboard.html

@@ -16,12 +16,29 @@
 
 <div class="padding">
 	<div class="margin">
-		<h5 class="m-b-0 _300">{{update_time}}
-			<i title="Данные о текущей смене скоро обновятся. Обновите страницу через несколько минут" class="fa fa-spinner fa-spin text-success" ng-if="need_update"></i>
-		</h5>
-		<small class="text-muted">Данные по филиалу
-			<strong>{{globals.currentUser.organization.name}}</strong>
-		</small>
+		<div class="row">
+			<div class="col-sm-9">
+				<h5 id="currentTime" class="m-b-0 _300">{{ currentDate | date:'dd.MM.yyyy HH:mm:ss' }}
+				</h5>
+				<small class="text-muted">Данные по филиалу
+					<strong>{{globals.currentUser.organization.name}}</strong>
+				</small>
+			</div>
+			<div class="col-sm-3">
+				<label class="md-switch">
+					<input id="timerCheckbox" type="checkbox" ng-model="timerEnabled" ng-change="toggleTimer()">
+					<i class="blue"></i>
+					<span ng-show="timerEnabled">
+						Автоматическое обновление через: {{ timeRemaining | date:'mm:ss' }}
+					</span>
+					<span ng-show="!timerEnabled">
+						Обновление данных отключено!
+					</span>
+				</label>
+
+			</div>
+		</div>
+
 	</div>
 
 	<div class="row">
@@ -113,7 +130,7 @@
 						<div class="box-tool box-tool-white">
 							<ul class="nav">
 								<li class="nav-item">
-									<a ng-click="getMore('delete')">
+									<a ng-click="getMoreDeleted()">
 										<i class="fa fa-eye"></i>
 									</a>
 								</li>
@@ -171,7 +188,7 @@
 						<div class="box-tool box-tool-white">
 							<ul class="nav">
 								<li class="nav-item">
-									<a ng-click="getMore('guests')">
+									<a ng-click="getMoreGuests()">
 										<i class="fa fa-eye"></i>
 									</a>
 								</li>
@@ -402,7 +419,7 @@
 	</div>
 
 	<div class="row">
-		<div class="col-md-12 col-xl-8" style="max-height: 620px; overflow-y: hidden;">
+		<div class="col-md-12 col-xl-8" style="max-height: 620px; "><!--overflow-y: hidden;-->
 			<div class="box">
 				<div class="box-header">
 					<h3>Топ продаваемых товаров</h3>
@@ -548,13 +565,13 @@
 	<div ui-include="'../views/dashboard/add.html'"></div>
 </div>
 
-<div class="modal fade" id="get-more-delete">
-	<div ui-include="'../views/dashboard/items/more-delete.html'"></div>
+<div class="modal fade" id="get-more-deleted">
+	<div ui-include="'../views/dashboard/items/more-deleted.html'"></div>
 </div>
 
-<div class="modal my-modal fade" id="get-more-newyear">
+<!--<div class="modal my-modal fade" id="get-more-newyear">
 	<div ui-include="'../views/dashboard/items/more-newyear.html'"></div>
-</div>
+</div>-->
 
 <div class="modal fade" id="get-more-guests">
 	<div ui-include="'../views/dashboard/items/more-guests.html'"></div>
@@ -592,8 +609,8 @@
 	<div ui-include="'../views/dashboard/items/items-staff.html'"></div>
 </div>
 
-<div class="modal fade" id="items-delete">
-	<div ui-include="'../views/dashboard/items/items-delete.html'"></div>
+<div class="modal fade" id="items-deleted">
+	<div ui-include="'../views/dashboard/items/items-deleted.html'"></div>
 </div>
 
 <div class="modal fade" id="preload-modal" data-backdrop="true">