ADAM / AIAHTML5

Closed
Merge Request #938 · created by Ayush Jain

Ci storage issue

From ciStorageIssue into Develop

Closed by Nikita Kulshreshtha

Changes were not merged into target branch

2 participants
Inline Side-by-side
Showing 5 changed files
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  Edit  View file @0450519
... ... @@ -814,10 +814,10 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
814 814  
815 815 }
816 816  
817   -
  817 +
818 818 $rootScope.LogoutUser = function () {
819 819 localStorage.removeItem('loggedInUserDetails');
820   - // localStorage.clear();
  820 + localStorage.clear();
821 821 document.location = '/';
822 822 $rootScope.isVisibleLogin = true;
823 823 }
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
  Edit  View file @0450519
... ... @@ -1372,7 +1372,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
1372 1372 // for closing email popup
1373 1373 $rootScope.closeLabExEmailModel();
1374 1374  
1375   - document.getElementById('labExEmailSentModalID').style.display = "block";
  1375 + //document.getElementById('labExEmailSentModalID').style.display = "block";
1376 1376 document.getElementById('labExModalbackground').style.display = "block";
1377 1377 }
1378 1378 $rootScope.closeLabExEmailModel = function () {
... ...
400-SOURCECODE/AIAHTML5.Web/app/services/LabExerciseService.js
  Edit  View file @0450519
... ... @@ -68,11 +68,22 @@
68 68  
69 69 .success(function (data, status, headers, config) {
70 70  
71   - console.log('success')
  71 + console.log('success');
  72 +
  73 + document.getElementById('notificationTitle').innerText = "Email Your Performance Report";
  74 + if (reportCopyStatus == true) {
  75 + document.getElementById('notificationMessage').innerText = "Your report has been sent. A copy has been emailed to you for your records.";
  76 + }
  77 + else {
  78 + document.getElementById('notificationMessage').innerText = "Your report has been sent.";
  79 + }
  80 + document.getElementById('labExEmailSentModalID').style.display = "block";
72 81 deferred.resolve(data);
73 82 }).error(function (data, status, headers, config) {
74   -
75   - console.log('error')
  83 + console.log('error');
  84 + document.getElementById('notificationTitle').innerText = "Alert";
  85 + document.getElementById('notificationMessage').innerText = "Invalid email Id";
  86 + document.getElementById('labExEmailSentModalID').style.display = "block";
76 87 deferred.reject(data);
77 88 });
78 89 return deferred.promise;
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/LabExerc/lab-exercises-detail.html
  Edit  View file @0450519
... ... @@ -132,11 +132,11 @@
132 132 <div class="modal-content">
133 133 <div class="modal-header">
134 134  
135   - <h4 class="modal-title" id="myModalLabel">Email Your Performance Report</h4>
  135 + <h4 class="modal-title" id="notificationTitle"></h4>
136 136 </div>
137 137 <div class="modal-body ">
138   - <div class="modal-body" style="padding:10px;font-size:15px;">
139   - Your report has been sent. A copy has been emailed to you for your records.
  138 + <div class="modal-body" id="notificationMessage" style="padding:10px;font-size:15px;">
  139 +
140 140 </div>
141 141 </div>
142 142 <div class="modal-footer">
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/tile-view.html
  Edit  View file @0450519
... ... @@ -50,23 +50,25 @@
50 50 </select>
51 51 </div>
52 52 </div>-->
  53 +
53 54 <div class="col-md-2 col-sm-4 pad-lftrgt3">
54 55 <div class="form-group">
55   - <h6 class="text-center text-primary txt-white f11">Search</h6>
56   -
57   - <div class="btn-group col-xs-12" style="padding:0;">
58   - <button type="button" class="btn btn-primary btn-sm col-xs-9" ng-click="Reset(1, query)"><i class="fa fa-eye"></i> Show All</button>
59   - <button type="button" class="btn btn-primary btn-sm col-xs-3" id="searchBtnAA" ng-click="FilterByImage(1, query)">
60   - <i class="fa fa-search"></i>
61   - </button>
62   -
  56 + <div class="col-xs-12" style="padding:0;">
  57 + <div class="col-xs-5" style="padding:0 2px 0 0;">
  58 + <h6 class="text-center text-primary txt-white f11 col-xs-12">Search</h6>
  59 + <button type="button" class="btn btn-primary btn-sm col-xs-12" id="searchBtnAA" ng-click="FilterByImage(1, query)">
  60 + <i class="fa fa-search"></i>
  61 + </button>
  62 + </div>
  63 + <div class="col-xs-7" style="padding:0;">
  64 + <h6 class="text-center text-primary txt-white f11 col-xs-12" style="padding:0;">Show All</h6>
  65 + <button type="button" class="btn btn-primary btn-sm col-xs-12" ng-click="Reset(1, query)"><i class="fa fa-eye"></i></button>
  66 + </div>
63 67 </div>
64   -
65   -
66   -
67 68 <!--<button class="btn btn-primary btn-sm" ng-click="ApplySearch(query)"><i class="fa fa-search"></i></button>&nbsp;<button class="btn btn-primary btn-sm col-md-9" ng-click="Reset(query)"><i class="fa fa-eye"></i> Show All</button>-->
68 69 </div>
69 70 </div>
  71 +
70 72 </div>
71 73 </div>
72 74 <!--</div>-->
... ...