v.2.10

-Fix cp1251 to utf-8 decode

web/controllers/shifts.js

@@ -123,7 +123,7 @@
 				$scope.total = data.total;
 
 				$('#report-out').modal();
-				}	
+				}
 
 			}, function (data) {
 				$scope.update();
@@ -131,6 +131,8 @@
 		};
 
 		$scope.restoreShift = function (shift) {
+			$('#preload-modal').modal();
+			Notification.primary('Дождитесь загрузки! Страница обновится автоматически.');
 			smartRequest.post('v1/restoreshift', {
 				shift_id: shift.id
 			}, function (data) {
@@ -138,11 +140,9 @@
 				$scope.response = data.message;
 				if (data.status == 'success') {
 					Notification.success(data.message);
-					console.log(data.status);
-					console.log(data.message);
 					setTimeout(function() {
 						location.reload();
-					}, 5000);
+					}, 1000);
 				}
 				if ($scope.status == 'error') {
 					Notification.error(data.message);

web/views/shifts/index.html

@@ -111,9 +111,13 @@
 </div>
 
 <div class="modal fade" id="report-out" data-backdrop="true">
-    <div ui-include="'../views/out.html'"></div>
+    <div ui-include="'../views/reports/items/out.html'"></div>
 </div>
 
 <div class="modal fade" id="reImport" data-backdrop="true">
     <div ui-include="'../views/shifts/reimport.html'"></div>
+</div>
+
+<div class="modal fade" id="preload-modal" data-backdrop="true">
+    <div ui-include="'../views/shifts/preload.html'"></div>
 </div>

web/views/shifts/preload.html

@@ -0,0 +1,5 @@
+<div class="ng-scope">
+      <div id="loader-wrapper">
+        <div id="loader"></div>
+      </div>
+    </div>

web/views/shifts/preload_1.html

@@ -0,0 +1,22 @@
+
+
+<div class="modal-dialog modal-lg">
+    <div class="modal-content">
+        <div class="modal-header">
+            <h5 class="modal-title">Выберите диапазон дат для повторной выгрузки файлов реализаций</h5>
+        </div>
+        <div class="modal-body text-center p-lg" style="height: 366px">
+            <div style="position: absolute;
+   top: 0;
+   left: 0;
+   width: 100%;
+   height: 100%;
+   z-index: 9999;
+   background-image: url('../views/shifts/images/350.gif');
+   background-repeat: no-repeat; 
+   background-color: #FFF;
+   background-position: center;"></div>
+        </div>
+
+    </div>
+</div>