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

file changes : nidila

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-08-18 11:43:08 +05:30
parent dbc0cf50d6
commit 4ca64d5b66
29 changed files with 92 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -170,7 +170,7 @@ swal("Warning!", "Status are required", "warning");
var logcheck = JSON.parse(localStorage.getItem('localObj'));
const LOCALTYPE = logcheck.localType;
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) {
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE =='R002' )) {
console.log("if");
}else {
if(logcheck != null && LOCALTYPE !='R001') {

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

@ -199,7 +199,7 @@ app.controller("CkeditorCtrl", ["$scope", "toaster", "$filter", "ngTableParams",
var logcheck = JSON.parse(localStorage.getItem('localObj'));
const LOCALTYPE = logcheck.localType;
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) {
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' )) {
console.log("if");
}else {
if(logcheck != null && LOCALTYPE !='R001') {

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

@ -244,7 +244,7 @@ app.controller('batchCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTabl
var logcheck = JSON.parse(localStorage.getItem('localObj'));
const LOCALTYPE = logcheck.localType;
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) {
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002')) {
console.log("if");
}else {
if(logcheck != null && LOCALTYPE !='R001') {

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

@ -357,7 +357,7 @@ app.controller('branchCtrl', ["$scope","toaster", "$filter", "ngTableParams", "A
var logcheck = JSON.parse(localStorage.getItem('localObj'));
const LOCALTYPE = logcheck.localType;
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) {
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002')) {
console.log("if");
}else {
if(logcheck != null && LOCALTYPE !='R001') {

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

@ -408,7 +408,7 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter",
var logcheck = JSON.parse(localStorage.getItem('localObj'));
const LOCALTYPE = logcheck.localType;
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) {
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002')) {
console.log("if");
}else {
if(logcheck != null && LOCALTYPE !='R001') {

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

@ -196,7 +196,7 @@ app.controller('centerCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
var logcheck = JSON.parse(localStorage.getItem('localObj'));
const LOCALTYPE = logcheck.localType;
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) {
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002')) {
console.log("if");
}else {
if(logcheck != null && LOCALTYPE !='R001') {

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

@ -115,7 +115,7 @@ $scope.certificateForm = {
var logcheck = JSON.parse(localStorage.getItem('localObj'));
const LOCALTYPE = logcheck.localType;
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) {
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' )) {
console.log("if");
}else {
if(logcheck != null && LOCALTYPE !='R001') {

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

@ -22,7 +22,7 @@ app.controller('datacorrectionCtrl', ["$scope","$rootScope","toaster", "$filter"
var logcheck = JSON.parse(localStorage.getItem('localObj'));
const LOCALTYPE = logcheck.localType;
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) {
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002')) {
console.log("if");
}else {
if(logcheck != null && LOCALTYPE !='R001') {

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

@ -123,7 +123,7 @@ app.controller("dayBookMasterCtrl", ["$scope", "toaster", "$filter", "API_POINTS
var logcheck = JSON.parse(localStorage.getItem('localObj'));
const LOCALTYPE = logcheck.localType;
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) {
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002')) {
console.log("if");
}else {
if(logcheck != null && LOCALTYPE !='R001') {

9
Apollo/assets/js/controllers/daybookCtrl.js
View File

@ -208,12 +208,19 @@ $scope.dayBookApprovalAccess = '';
}
$scope.copyModel = function (p) {
var inc = $scope.incomeExpenseType.filter((inc)=>inc.ID == p.Type);
console.log(inc);
$scope.incexp = inc[0];
console.log($scope.incexp.ID);
console.log(p);
$scope.myModel = {
"id": p.ID,
"date": p.Date,
"incomeExpense": p.Name,
"type": p.Type,
"type":$scope.incexp.ID,
"amount": p.Amount,
"status": p.Status,
"description": p.Description,

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

@ -67,7 +67,7 @@ app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$
// load when html page load
$scope.init = function () {
const LOCALTYPE = localDetail.localType;
if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) {
if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE =='R002')) {
$scope.currentDate = new Date();
$scope.localUserListCode = localDetail.localType;
$scope.localBranchID = localDetails.localBranchID;

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

@ -18,7 +18,7 @@ app.controller("incomeCtrl", ["$scope", "toaster", "$filter", "API_POINTS", "$lo
$scope.initHead = function() {
// alert();
const LOCALTYPE = localDetail.localType;
if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) {
if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002')) {
}else {
if(localDetail != null) {
$state.go('app.dashboard');

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

@ -23,7 +23,7 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter",
var logcheck = JSON.parse(localStorage.getItem('localObj'));
const LOCALTYPE = logcheck.localType;
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) {
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' )) {
console.log("if");
}else {
if(logcheck != null && LOCALTYPE !='R001') {

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

@ -527,7 +527,7 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP
var logcheck = JSON.parse(localStorage.getItem('localObj'));
const LOCALTYPE = logcheck.localType;
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) {
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' )) {
console.log("if");
}else {
if(logcheck != null && LOCALTYPE !='R001') {

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

@ -69,7 +69,7 @@ app.controller('semcoursemapCtrl', ["$scope","$rootScope","toaster", "$filter",
var logcheck = JSON.parse(localStorage.getItem('localObj'));
const LOCALTYPE = logcheck.localType;
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) {
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' )) {
console.log("if");
}else {
if(logcheck != null && LOCALTYPE !='R001') {

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

@ -19,7 +19,7 @@ app.controller('sendSMSDetailssuperadminCtrl', ["$scope", "$filter", "ngTablePar
var logcheck = JSON.parse(localStorage.getItem('localObj'));
const LOCALTYPE = localDetail.localType;
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) {
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' )) {
console.log("if");
}else {
if(logcheck != null && LOCALTYPE !='R001') {

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

@ -15,7 +15,7 @@ app.controller('sendSMSsuperadminCtrl', ["$scope", "$filter", "ngTableParams", "
var logcheck = JSON.parse(localStorage.getItem('localObj'));
const LOCALTYPE = logcheck.localType;
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) {
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002')) {
console.log("if");
}else {
if(logcheck != null && LOCALTYPE !='R001') {

9
Apollo/assets/js/controllers/sessionCtrl.js
View File

@ -76,6 +76,8 @@ app.controller('sessionCtrl', ["$scope", "$localStorage", "$state", 'ipCookie',
if (inlocalDetails != null) {
if (inlocalDetails.localType == 'R003' && inlocalDetailss.localType == 'R003') {
// console.log('if')
} else {
if (inlocalDetails.localType == '' && inlocalDetailss.localType == '') {
ipCookie.remove('cookiechk');
@ -100,15 +102,22 @@ app.controller('sessionCtrl', ["$scope", "$localStorage", "$state", 'ipCookie',
$scope.checkStaff = function () {
var inlocalDetails = JSON.parse(localStorage.getItem('localObj'));
var inlocalDetailss = ipCookie('cookiechk');
console.log(inlocalDetails);
if (inlocalDetails != null) {
if ((inlocalDetails.localType == 'R002' && inlocalDetailss.localType == 'R002') || (inlocalDetails.localType == 'R005' && inlocalDetailss.localType == 'R005')) {
console.log('if');
} else {
if (inlocalDetails.localType == '' && inlocalDetailss.localType == '') {
console.log('else if');
ipCookie.remove('cookiechk');
$window.localStorage.clear();
$state.go('login.signin');
} else {
console.log('else else')
$location.url('/dashboard').replace();
$window.location.reload();
$state.go('app.dashboard');

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

@ -200,7 +200,7 @@ app.controller('sessionMasterCtrl', ["$scope","$rootScope","toaster", "$filter",
var logcheck = JSON.parse(localStorage.getItem('localObj'));
const LOCALTYPE = logcheck.localType;
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) {
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' )) {
console.log("if");
}else {
if(logcheck != null && LOCALTYPE !='R001') {

4
Apollo/assets/js/controllers/sessionScheduleCtrl.js
View File

@ -273,10 +273,10 @@ app.controller('sessionScheduleCtrl', ["$scope","$rootScope","toaster", "$filter
$rootScope.init = function () {
var logcheck = JSON.parse(localStorage.getItem('localObj'));
var logcheck = JSON.parse(localStorage.getItem('localObj'));
const LOCALTYPE = logcheck.localType;
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) {
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002')) {
console.log("if");
}else {
if(logcheck != null && LOCALTYPE !='R001') {

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

@ -18,7 +18,7 @@ app.controller("statusCtrl", ["$scope", "toaster", "$filter", "API_POINTS", "$lo
$scope.initHead = function() {
// alert();
const LOCALTYPE = localDetail.localType;
if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) {
if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE =='R002')) {
}else {
if(localDetail != null && LOCALTYPE != 'R001') {
$state.go('app.dashboard');

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

@ -56,7 +56,7 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
var logcheck = JSON.parse(localStorage.getItem('localObj'));
const LOCALTYPE = logcheck.localType;
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) {
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' )) {
console.log("if");
}else {
if(logcheck != null && LOCALTYPE !='R001') {

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

@ -35,7 +35,7 @@ app.controller('studyMaterialStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
var logcheck = JSON.parse(localStorage.getItem('localObj'));
const LOCALTYPE = logcheck.localType;
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) {
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE=='R002' )) {
console.log("if");
}else {
if(logcheck != null && LOCALTYPE !='R001') {

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

@ -200,7 +200,7 @@ app.controller('subjectCtrl', ["$scope", "$rootScope","toaster", "$filter", "ngT
var logcheck = JSON.parse(localStorage.getItem('localObj'));
const LOCALTYPE = logcheck.localType;
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) {
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' )) {
console.log("if");
}else {
if(logcheck != null && LOCALTYPE !='R001') {

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

@ -31,7 +31,7 @@ app.controller('universityCtrl', ["$scope", "toaster", "$filter", "ngTableParams
$scope.init = function() {
// alert();
const LOCALTYPE = localDetail.localType;
if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) {
if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' )) {
$scope.getUniversityList();
}else {
if(localDetail != null && LOCALTYPE != 'R001') {

4
Apollo/assets/views/daybook/dayBookApproval.html
View File

@ -76,7 +76,9 @@
<select class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="addName" ng-model="showTheRefValue" ng-change="showTheResType(showTheRefValue)"
required>
<option value="" selected>Select</option>
<option ng-repeat="typeName in incomeExpenseName" ng-selected="showTheRefValue == typeName.ListCode" value="{{typeName.ListCode}}">{{typeName.ListName}}</option>
<option value="I001">EXPENSE</option>
<option value="I002">INCOME</option>
<!-- <option ng-repeat="typeName in incomeExpenseName" ng-selected="showTheRefValue == typeName.ListCode" value="{{typeName.ListCode}}">{{typeName.ListName}}</option> -->
</select>
<span class="error text-small block" ng-if="Form.addName.$dirty && Form.addName.$error.required">Type is Required</span>

4
Apollo/assets/views/daybook/dayBookadminApproval.html
View File

@ -83,7 +83,9 @@
<select class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="addName" ng-model="showTheRefValue" ng-change="showTheResType(showTheRefValue)"
required>
<option value="" selected>Select</option>
<option ng-repeat="typeName in incomeExpenseName" ng-selected="showTheRefValue == typeName.ListCode" value="{{typeName.ListCode}}">{{typeName.ListName}}</option>
<option value="I001">EXPENSE</option>
<option value="I002">INCOME</option>
<!-- <option ng-repeat="typeName in incomeExpenseName" ng-selected="showTheRefValue == typeName.ListCode" value="{{typeName.ListCode}}">{{typeName.ListName}}</option> -->
</select>
<span class="error text-small block" ng-if="Form.addName.$dirty && Form.addName.$error.required">Type is Required</span>

33
Apollo/assets/views/daybook/daybook.html
View File

@ -255,12 +255,22 @@
<label for="form-field-select-2">
Type <span class="symbol required"></span>
</label>
<!--
<select class="form-control" ng-init="getType(p.Name)" tabindex="1" class="cs-select cs-skin-elastic" name="editType" ng-model="myModel.type"
required>
<option value="" disabled selected>Select Type</option>
<option ng-repeat="typeItem in getTypes" ng-selected="typeItem.ID == p.Type" value="{{typeItem.ID}}">{{typeItem.TypeName}}</option>
</select>
</select> -->
<!-- {{myModel.type}} {{incomeExpenseType}} -->
<select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="addType" ng-model="myModel.type" required>
<optgroup ng-repeat="typeName in incomeExpenseName" label="{{typeName.ListName}}">
<option ng-repeat="incexpType in incomeExpenseType" ng-if="typeName.ListCode == incexpType.TypeID" value="{{incexpType.ID}}" ng-selected="incexp.ID == incexpType.ID">{{incexpType.TypeName}}</option>
</optgroup>
</select>
<span class="error text-small block" ng-if="Form.editType.$dirty && Form.editType.$error.required">Type is Required</span>
</div>
@ -344,7 +354,9 @@
<select class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="addName" ng-model="myModelAdd.name" ng-change="getType(myModelAdd.name)"
required>
<option value="" disabled selected>Select</option>
<option ng-repeat="typeName in incomeExpenseName" value="{{typeName.ListCode}}">{{typeName.ListName}}</option>
<!-- <option ng-repeat="typeName in incomeExpenseName" value="{{typeName.ListCode}}">{{typeName.ListName}}</option> -->
<option value="I001">EXPENSE</option>
<option value="I002">INCOME</option>
</select>
<span class="error text-small block" ng-if="Form.addName.$dirty && Form.addName.$error.required">Type is Required</span>
</div>
@ -386,10 +398,23 @@
<label for="form-field-select-2">
Type <span class="symbol required"></span>
</label>
<select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="addType" ng-model="myModelAdd.type" required>
<!-- <select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="addType" ng-model="myModelAdd.type" required>
<option value="" disabled selected>Select Type</option>
<option ng-repeat="typeItem in getTypes" value="{{typeItem.ID}}">{{typeItem.TypeName}}</option>
</select> -->
<select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="addType" ng-model="myModelAdd.type" required>
<option value="" disabled selected>Select Type</option>
<optgroup ng-repeat="typeName in incomeExpenseName" label="{{typeName.ListName}}">
<option ng-repeat="incexpType in incomeExpenseType" ng-if="typeName.ListCode == incexpType.TypeID" value="{{incexpType.ID}}">{{incexpType.TypeName}}</option>
</optgroup>
<!-- <option value="" disabled selected>Select Type</option>
<option ng-repeat="typeItem in getTypes" value="{{typeItem.ID}}">{{typeItem.TypeName}}</option> -->
</select>
<span class="error text-small block" ng-if="Form.addType.$dirty && Form.addType.$error.required">Type is Required</span>
</div>

18
Apollo/assets/views/daybook/daybookadmin.html
View File

@ -358,7 +358,9 @@
<select class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="addName" ng-model="myModelAdd.name" ng-change="getType(myModelAdd.name)"
required>
<option value="" disabled selected>Select</option>
<option ng-repeat="typeName in incomeExpenseName" value="{{typeName.ListCode}}">{{typeName.ListName}}</option>
<!-- <option ng-repeat="typeName in incomeExpenseName" value="{{typeName.ListCode}}">{{typeName.ListName}}</option> -->
<option value="I001">EXPENSE</option>
<option value="I002">INCOME</option>
</select>
<span class="error text-small block" ng-if="Form.addName.$dirty && Form.addName.$error.required">Type is Required</span>
</div>
@ -400,10 +402,22 @@
<label for="form-field-select-2">
Type <span class="symbol required"></span>
</label>
<select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="addType" ng-model="myModelAdd.type" required>
<!-- <select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="addType" ng-model="myModelAdd.type" required>
<option value="" disabled selected>Select Type</option>
<option ng-repeat="typeItem in getTypes" value="{{typeItem.ID}}">{{typeItem.TypeName}}</option>
</select> -->
<select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="addType" ng-model="myModelAdd.type" required>
<option value="" disabled selected>Select Type</option>
<optgroup ng-repeat="typeName in incomeExpenseName" label="{{typeName.ListName}}">
<option ng-repeat="incexpType in incomeExpenseType" ng-if="typeName.ListCode == incexpType.TypeID" value="{{incexpType.ID}}">{{incexpType.TypeName}}</option>
</optgroup>
<!-- <option value="" disabled selected>Select Type</option>
<option ng-repeat="typeItem in getTypes" value="{{typeItem.ID}}">{{typeItem.TypeName}}</option> -->
</select>
<span class="error text-small block" ng-if="Form.addType.$dirty && Form.addType.$error.required">Type is Required</span>
</div>