Apollo-DEC/apollodec
Apollo-DEC/apollodec
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
gandhimathi 2018-02-23 16:22:31 +05:30
commit efd5726432
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Apollo/assets/js/controllers/dashboardCtrl.js
View File

@ -285,7 +285,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$modal", "$log", "API_POINTS"
}); });
} else { } else {
swal("Failed!", "This student is not registered", "warning"); swal("Failed!", "This student is not registerd", "warning");
$scope.courseEditLoading = false; $scope.courseEditLoading = false;
$scope.studentDetails = ""; $scope.studentDetails = "";
$scope.courseDetails = ""; $scope.courseDetails = "";

4
Apollo/assets/views/editEmployeeBranchDetails.html
View File

@ -428,12 +428,12 @@
<div class="row"> <div class="row">
<div class="col-md-4 form-group" ng-class="{'has-error':Form.financeModuleAccess.$dirty && Form.financeModuleAccess.$invalid, 'has-success':Form.financeModuleAccess.$valid && empRoleDetail.FinanceModuleAccess == true}"> <div class="col-md-4 form-group" ng-class="{'has-error':Form.financeModuleAccess.$dirty && Form.financeModuleAccess.$invalid, 'has-success':Form.financeModuleAccess.$valid && empRoleDetail.FinanceModuleAccess == true}">
<label> <label>
Day Book Access <span ng-if="empRoleDetail.FinanceModuleAccess" class="symbol"></span> Expenses Access <span ng-if="empRoleDetail.FinanceModuleAccess" class="symbol"></span>
</label> </label>
<div class="checkbox clip-check check-primary"> <div class="checkbox clip-check check-primary">
<input type="checkbox" id="checkbox6" name="financeModuleAccess" ng-model="empRoleDetail.FinanceModuleAccess"> <input type="checkbox" id="checkbox6" name="financeModuleAccess" ng-model="empRoleDetail.FinanceModuleAccess">
<label for="checkbox6"> <label for="checkbox6">
Day Book Approval Access Expenses Approval Access
</label> </label>
</div> </div>
<span ng-if="myModel.finaceModuleAccess" class="success text-small block"></span> <span ng-if="myModel.finaceModuleAccess" class="success text-small block"></span>