diff --git a/Apollo/api/application/models/Batch_model.php b/Apollo/api/application/models/Batch_model.php index e9a83539..91b5640e 100755 --- a/Apollo/api/application/models/Batch_model.php +++ b/Apollo/api/application/models/Batch_model.php @@ -22,7 +22,7 @@ class Batch_model extends CI_Model { $this->db->where('BatchCode', $arrayDetails['BatchCode']); if($this->db->get(BATCH)->first_row()){ $result['batchStatus'] = false; - $result['message'] = "This batch Code is already exist!"; + $result['message'] = "This batch code is already exist."; } else { $this->db->insert(BATCH, $arrayDetails); if ($this->db->affected_rows() == '1') { diff --git a/Apollo/assets/css/styles.css b/Apollo/assets/css/styles.css index ba6539f6..86cc63c1 100755 --- a/Apollo/assets/css/styles.css +++ b/Apollo/assets/css/styles.css @@ -2506,6 +2506,9 @@ ul.sub-menu li ul.sub-menu li ul.sub-menu li a { .height-350 { height: 350px !important; } +.height-460 { + height: 460px !important; +} .width-200 { width: 200px !important; diff --git a/Apollo/assets/i18n/en.json b/Apollo/assets/i18n/en.json index 94c6334e..dd63b5da 100755 --- a/Apollo/assets/i18n/en.json +++ b/Apollo/assets/i18n/en.json @@ -1,7 +1,7 @@ { "dashboard": { "WELCOME": "Welcome to {{appName}}" - }, + }, "topbar": { "messages": { "MAIN": "Messages", @@ -57,28 +57,28 @@ "MAIN": "Dashboard" }, "master": { - "MAIN": "MASTER DETAILS", - "BRANCH": "BRANCH DETAILS", - "STAFF": "STAFF DETAILS", - "BATCH": "BATCH DETAILS", - "UNIVERSITY": "UNIVERSITY DETAILS", - "COURSE": "COURSE DETAILS", - "ACTIVITY": "ACTIVITY DETAILS", - "EMPLOYEE": "EMPLOYEE DETAILS", - "ANNOUNCEMENT": "ANNOUNCEMENT DETAILS", - "STATUS": "STATUS DETAILS", - "STUDENTSTATUS": "STUDENT ACTIVITY STATUS", + "MAIN": "SETTINGS", + "BRANCH": "BRANCH ", + "STAFF": "STAFF ", + "BATCH": "BATCH ", + "UNIVERSITY": "UNIVERSITY", + "COURSE": "COURSE ", + "ACTIVITY": "ACTIVITY", + "EMPLOYEE": "EMPLOYEE", + "ANNOUNCEMENT": "ANNOUNCEMENT", + "STATUS": "STATUS", + "STUDENTSTATUS": "ACTIVITY STATUS", "CERTIFICATETYPE": "CERTIFICATE TYPE", - "DAYBOOKMASTER":"DAY BOOK DETAILS" + "DAYBOOKMASTER":"EXPENSE HEADS" }, "student": { - "MAIN": "MANAGE STUDENTS", + "MAIN": "STUDENTS", "LISTING": "STUDENTS LISTING", "ENROLLMENT": "STUDENT ENROLLMENT", "STUDENTDETAILS": "STUDENT DETAILS", - "STUDENTDETAILSADDEDIT": "ADD/EDIT STUDENT DETAILS", + "STUDENTDETAILSADDEDIT": "MANAGE DETAILS", "status" : { - "MAIN": "STATUS UPDATE", + "MAIN": "UPDATE STATUS ", "STUDYMATERIAL": "STUDY MATERIAL", "ANSWERBOOKLET": "ANSWER BOOKLET", "CERTIFICATION": "MARK CARD", @@ -88,7 +88,7 @@ "status": { "MAIN": "STATUS", "APPLICATION": "APPLICATION STATUS", - "FEES": "FEES STATUS", + "FEES": "FEES ", "STUDENTFEES":"FEES DETAILS", "CERTIFICATE": "CERTIFICATE STATUS", "ANSWERBOOKLET": "ANSWER BOOKLET STATUS", @@ -103,17 +103,17 @@ }, "tracking": { "MAIN": "CALL TRACKING", - "details":"ADD/VIEW DETAILS", - "close":"CLOSE DETAILS", - "pending":"PENDING DETAILS", - "lead":"LEAD DETAILS" + "details":"ADD/VIEW LEADS", + "close":"CLOSED LEADS", + "pending":"PENDING LEADS", + "lead":"DAY WISE LEADS" }, "daybook": { - "MAIN": "DAY BOOK", + "MAIN": "INCOME / EXPENSE", "INCOMELISTING": "INCOME LISTING", "EXPENSELISTING": "EXPENSE LISTING", "DAYBOOK": "DAY BOOK ", - "APPROVAL": "DAY BOOK APPROVAL" + "APPROVAL": "APPROVE EXPENSE" }, "mydetails": { "MAIN": "MY DETAILS" @@ -127,9 +127,9 @@ "MAIN": "MY PROFILE" }, "sendSMSPage": { - "MAIN": "BROADCAST", - "SENDSMS": "SMS SENT", - "SENDSMSDETAILS": "SENT SMS DETAILS" + "MAIN": "BROADCAST SMS", + "SENDSMS": "SEND MESSAGE", + "SENDSMSDETAILS": "SENT MESSAGE" } } }, diff --git a/Apollo/assets/js/config.router.js b/Apollo/assets/js/config.router.js index a36d78c3..a33d8bad 100755 --- a/Apollo/assets/js/config.router.js +++ b/Apollo/assets/js/config.router.js @@ -14,8 +14,7 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com app.constant = $provide.constant; app.value = $provide.value; - - + // LAZY MODULES $ocLazyLoadProvider.config({ @@ -98,9 +97,9 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com }).state('app.master', { url: '/master', template: '
', - title: 'Master Details', + title: 'Settings', ncyBreadcrumb: { - label: 'Master Details' + label: 'Settings' } }).state('app.master.branch', { url: '/branch', @@ -167,9 +166,9 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com url: '/default activity', templateUrl: "assets/views/studentStatusUpdate.html", resolve: loadSequence('ui.select','studentStatusUpdateCtrl','ngTable', 'ladda', 'angular-ladda'), - title: 'Status', + title: 'Activity Status', ncyBreadcrumb: { - label: 'Status' + label: 'Activity Status' }, }).state('app.master.dayBookMaster', { url: '/day book master', @@ -192,7 +191,7 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com url: '/activity', templateUrl: "assets/views/activity.html", resolve: loadSequence('ui.select','activityCtrl','ngTable', 'ladda', 'angular-ladda'), - title: 'Activity', + title: 'Add/Edit Activity List', ncyBreadcrumb: { label: 'Activity' }, @@ -231,9 +230,9 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com url: '/studentDetailsAddEdit', templateUrl: "assets/views/student/student_details_SuperAdmin.html", resolve: loadSequence('ui.select','spin', 'ui.mask', 'ladda', 'angular-ladda', 'studentCtrl', 'ngTable'), - title: 'Add/Edit Student Details', + title: 'Manage Details', ncyBreadcrumb: { - label: 'Add/Edit Student Details' + label: 'Manage Details' } }).state('app.student.status', { url: '/status', @@ -315,17 +314,17 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com }).state('app.call', { url: '/call', template: '
', - title: 'call tracking', + title: 'Call tracking', ncyBreadcrumb: { - label: 'tracking' + label: 'Call Tracking' } }).state('app.call.tracking', { url: '/tracking', templateUrl: "assets/views/callTrackingDetails.html", - title: 'tracking', + title: 'Add/View leads', resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'callTrackingCtrl','ngTable'), ncyBreadcrumb: { - label: 'details' + label: 'Add/View leads' } }).state('app.call.trackingFollowup', { url: '/tracking_followup', @@ -339,65 +338,65 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com }).state('app.call.lead', { url: '/lead', templateUrl: "assets/views/callTrackingLeadDetails.html", - title: 'lead', + title: 'Day wise leads', resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'callTrackingCtrl','ngTable'), ncyBreadcrumb: { - label: 'lead' + label: 'Day wise leads' } }).state('app.call.close', { url: '/close', templateUrl: "assets/views/callTrackingCloseDetails.html", - title: 'close', + title: 'Closed leads', resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'callTrackingCtrl','ngTable'), ncyBreadcrumb: { - label: 'close' + label: 'Closed leads' } }).state('app.call.pending', { url: '/pending', templateUrl: "assets/views/callTrackingPendingDetails.html", - title: 'pending', + title: 'Pending leads', resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'callTrackingCtrl','ngTable'), ncyBreadcrumb: { - label: 'pending' + label: 'Pending leads' } }).state('app.daybook', { url: '/daybook', template: '
STUDENT STATUS UPDATE
', - title: 'daybook', + title: 'Income/Expense', ncyBreadcrumb: { - label: 'daybook' + label: 'Income/Expense' } }).state('app.daybook.details', { url: '/daybookdetails', templateUrl: "assets/views/daybook/daybook.html", - title: 'daybookdetails', + title: 'Income/Expense', resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'daybookCtrl','ngTable'), ncyBreadcrumb: { - label: 'daybookdetails' + label: 'Income/Expense' } }).state('app.daybook.approval', { url: '/daybookApproval', templateUrl: "assets/views/daybook/dayBookApproval.html", - title: 'Day Book Approval', + title: 'Approve expense', resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'daybookapprovalCtrl','ngTable'), ncyBreadcrumb: { - label: 'daybookApproval' + label: 'Approve expense' } }).state('app.daybookadmin', { url: '/daybookadmin', templateUrl: "assets/views/daybook/daybookadmin.html", - title: 'daybook', + title: 'Income/Expense', resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'daybookadminCtrl','ngTable'), ncyBreadcrumb: { - label: 'daybook' + label: 'Income/Expense' } }).state('app.daybooksuperadmin', { url: '/daybooksuperadmin', templateUrl: "assets/views/daybook/daybooksuperadmin.html", - title: 'daybook', + title: 'Income/Expense', resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'daybooksuperadminCtrl','ngTable'), ncyBreadcrumb: { - label: 'daybook' + label: 'Income/Expense' } }).state('app.broadCast', { url: '/broadcast', diff --git a/Apollo/assets/js/controllers/activityCtrl.js b/Apollo/assets/js/controllers/activityCtrl.js index 8ef015f9..d24d4882 100755 --- a/Apollo/assets/js/controllers/activityCtrl.js +++ b/Apollo/assets/js/controllers/activityCtrl.js @@ -99,11 +99,11 @@ if(myModel.status.length > 0) { if (response.data.status == 200 && response.data.activityStatus) { $scope.ldloading[loading.replace('-', '_')] = false; $scope.init(); - swal("Success!", response.data.message, "success"); + swal("","Activity details added successfully.", "success"); $state.go($state.current, {}, { reload: true }); } else { $scope.ldloading[loading.replace('-', '_')] = false; - swal("Failed!", response.data.message, "error"); + swal(" ", "Something went wrong.please try again.", "error"); } }); @@ -215,14 +215,14 @@ swal("Warning!", "Status are required", "warning"); if (response.data.status==200 && response.data.activityStatus) { $scope.ldloading3[loading.replace('-', '_')] = false; - swal("Success!", response.data.message, "success"); + swal(" "," Updated Successfully", "success"); $scope.init(); $scope.editId = -1; } else { $scope.ldloading3[loading.replace('-', '_')] = false; - swal("Failed!", response.data.message, "error"); + swal(" ","Something went wrong.please try again", "error"); } }); } diff --git a/Apollo/assets/js/controllers/announcementCtrl.js b/Apollo/assets/js/controllers/announcementCtrl.js index 676753b8..7401bcdf 100755 --- a/Apollo/assets/js/controllers/announcementCtrl.js +++ b/Apollo/assets/js/controllers/announcementCtrl.js @@ -55,10 +55,7 @@ app.controller("CkeditorCtrl", ["$scope", "toaster", "$filter", "ngTableParams", // $scope.submitForm = function() { // alert(JSON.stringify($scope.myModel.description)); // } - - - - + $scope.announcementForm = { submit: function (form, myModel, loading) { @@ -101,11 +98,11 @@ app.controller("CkeditorCtrl", ["$scope", "toaster", "$filter", "ngTableParams", $http(addAnnouncement).then(function (response) { if (response.data.status == 200 && response.data.AnnouncementStatus) { $scope.ldloading1[loading.replace('-', '_')] = false; - swal("Success!", response.data.message, "success"); + swal("", "Announcement added successfully.", "success"); $state.go($state.current, {}, { reload: true }); } else { $scope.ldloading1[loading.replace('-', '_')] = false; - swal("Failed!", response.data.message, "error"); + swal("", response.data.message, "error"); } }); @@ -174,13 +171,13 @@ app.controller("CkeditorCtrl", ["$scope", "toaster", "$filter", "ngTableParams", if (response.data.status == 200 && response.data.AnnouncementStatus) { $scope.ldloading[loading.replace('-', '_')] = false; - swal("Success!", response.data.message, "success"); + swal("","Updated successfully." , "success"); $scope.editId = -1; $scope.init(); } else { $scope.ldloading[loading.replace('-', '_')] = false; - swal("Failed!", response.data.message, "error"); + swal(" ", response.data.message, "error"); } }); } diff --git a/Apollo/assets/js/controllers/answerBookletStatusCtrl.js b/Apollo/assets/js/controllers/answerBookletStatusCtrl.js index a4ccd06f..3ad376c8 100755 --- a/Apollo/assets/js/controllers/answerBookletStatusCtrl.js +++ b/Apollo/assets/js/controllers/answerBookletStatusCtrl.js @@ -332,14 +332,14 @@ app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTa }; $http(updateStudyMaterial).then(function (response) { if (response.data.addStatus) { - swal("Success!", response.data.message, "success"); + swal(" ", "Updated successfully.", "success"); $scope.disableButton = false; angular.forEach($scope.searchResultDetails, function (item) { item.Selected = false; }); $scope.OpenWindowStatus = false; } else { - swal("Failed!", response.data.message, "error"); + swal(" ", response.data.message, "error"); $scope.disableButton = false; } }); diff --git a/Apollo/assets/js/controllers/applicationStatusCtrl.js b/Apollo/assets/js/controllers/applicationStatusCtrl.js index 01e528db..61f5b540 100755 --- a/Apollo/assets/js/controllers/applicationStatusCtrl.js +++ b/Apollo/assets/js/controllers/applicationStatusCtrl.js @@ -366,7 +366,7 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl }; $http(updateStudyMaterial).then(function (response) { if (response.data.addStatus) { - swal("Success!", response.data.message, "success"); + swal(" ","Updated successfully.", "success"); $scope.disableButton = false; // for success state angular.forEach($scope.searchResultDetails, function (item) { @@ -375,7 +375,7 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl // $scope.OpenWindowStatus = false; $scope.OpenWindowStatus = false; } else { - swal("Failed!", response.data.message, "error"); + swal(" ", response.data.message, "error"); $scope.disableButton = false; // for success state angular.forEach($scope.searchResultDetails, function (item) { diff --git a/Apollo/assets/js/controllers/batchCtrl.js b/Apollo/assets/js/controllers/batchCtrl.js index b823a6c2..a5337005 100755 --- a/Apollo/assets/js/controllers/batchCtrl.js +++ b/Apollo/assets/js/controllers/batchCtrl.js @@ -87,11 +87,11 @@ app.controller('batchCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTabl $http(addBatch).then(function (response) { if (response.data.status==200 && response.data.batchStatus) { $scope.ldloading1[loading.replace('-', '_')] = false; - swal("Success!", response.data.message, "success"); + swal("", "Batch added successfully.", "success"); $state.go($state.current, {}, {reload: true}); } else { $scope.ldloading1[loading.replace('-', '_')] = false; - swal("Failed!", response.data.message, "error"); + swal("", response.data.message, "error"); } }); @@ -154,12 +154,12 @@ app.controller('batchCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTabl $scope.ldloading[loading.replace('-', '_')] = false; $scope.editId = -1; $scope.init(); - swal("Success!", response.data.message, "success"); + swal("", "Updated Successfully.", "success"); } else { $scope.ldloading[loading.replace('-', '_')] = false; - swal("Failed!", response.data.message, "error"); + swal("", response.data.message, "error"); } }); } diff --git a/Apollo/assets/js/controllers/branchCtrl.js b/Apollo/assets/js/controllers/branchCtrl.js index 2075a734..4f9a7cfb 100755 --- a/Apollo/assets/js/controllers/branchCtrl.js +++ b/Apollo/assets/js/controllers/branchCtrl.js @@ -144,11 +144,11 @@ app.controller('branchCtrl', ["$scope","toaster", "$filter", "ngTableParams", "A }).success(function (data) { if (data.status==200 && data.branchStatus) { $scope.ldloading1[loading.replace('-', '_')] = false; - swal("Success!", data.message, "success"); + swal("", "Branch added successfully.", "success"); $state.go($state.current, {}, {reload: true}); } else { $scope.ldloading1[loading.replace('-', '_')] = false; - swal("Failed!", data.message, "error"); + swal("", data.message, "error"); } }); @@ -295,12 +295,12 @@ app.controller('branchCtrl', ["$scope","toaster", "$filter", "ngTableParams", "A }).success(function (data) { if (data.status==200 && data.branchStatus) { $scope.ldloading[loading.replace('-', '_')] = false; - swal("Success!", data.message, "success"); + swal("", "Updated Successfully.", "success"); $scope.editId = -1; $scope.init(); } else { $scope.ldloading1[loading.replace('-', '_')] = false; - swal("Failed!", data.message, "error"); + swal("", data.message, "error"); } }); diff --git a/Apollo/assets/js/controllers/callTrackingCtrl.js b/Apollo/assets/js/controllers/callTrackingCtrl.js index 970e1f6a..39628392 100755 --- a/Apollo/assets/js/controllers/callTrackingCtrl.js +++ b/Apollo/assets/js/controllers/callTrackingCtrl.js @@ -306,11 +306,11 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter", $http(addLead).then(function (response) { if (response.data.status==200 && response.data.leadStatus) { $scope.ldloading1[loading.replace('-', '_')] = false; - swal("Success!", response.data.message, "success"); + swal(" ", "Lead tracking added successfully.", "success"); $state.go($state.current, {}, {reload: true}); } else { $scope.ldloading1[loading.replace('-', '_')] = false; - swal("Failed!", response.data.message, "error"); + swal(" ", response.data.message, "error"); } }); diff --git a/Apollo/assets/js/controllers/certificateCtrl.js b/Apollo/assets/js/controllers/certificateCtrl.js index 6835087c..513eccc2 100755 --- a/Apollo/assets/js/controllers/certificateCtrl.js +++ b/Apollo/assets/js/controllers/certificateCtrl.js @@ -81,11 +81,11 @@ $scope.certificateForm = { if (response.data.status == 200 && response.data.certificateStatus) { $scope.ldloading1[loading.replace('-', '_')] = false; $scope.init(); - swal("Success!", response.data.message, "success"); + swal(" ","Certificate added successfully.", "success"); $state.go($state.current, {}, { reload: true }); } else { $scope.ldloading1[loading.replace('-', '_')] = false; - swal("Failed!", response.data.message, "error"); + swal(" ", response.data.message, "error"); } }); @@ -182,13 +182,13 @@ $scope.certificateForm = { $http(update).then(function (response) { if (response.data.status==200 && response.data.certificateStatus) { $scope.ldloading[loading.replace('-', '_')] = false; - swal("Success!", response.data.message, "success"); + swal(" ","Updated successfully." , "success"); $scope.editId = -1; $scope.init(); } else { $scope.ldloading[loading.replace('-', '_')] = false; - swal("Failed!", response.data.message, "error"); + swal(" ", response.data.message, "error"); } }); diff --git a/Apollo/assets/js/controllers/certificationStatusCtrl.js b/Apollo/assets/js/controllers/certificationStatusCtrl.js index 55f970af..50b98552 100755 --- a/Apollo/assets/js/controllers/certificationStatusCtrl.js +++ b/Apollo/assets/js/controllers/certificationStatusCtrl.js @@ -368,7 +368,7 @@ app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTa }; $http(updateCertificateStatus).then(function (response) { if (response.data.addStatus) { - swal("Success!", response.data.message, "success"); + swal(" ", "Updated Successfully.", "success"); $scope.disableButton = false; // for success state // $scope.allSelected('undefined'); @@ -377,7 +377,7 @@ app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTa }); $scope.OpenWindowStatus = false; } else { - swal("Failed!", response.data.message, "error"); + swal(" ", response.data.message, "error"); $scope.disableButton = false; } }); diff --git a/Apollo/assets/js/controllers/changePasswordCtrl.js b/Apollo/assets/js/controllers/changePasswordCtrl.js index 59f3dbd0..368501be 100755 --- a/Apollo/assets/js/controllers/changePasswordCtrl.js +++ b/Apollo/assets/js/controllers/changePasswordCtrl.js @@ -51,7 +51,7 @@ app.controller('changePasswordCtrl', ["$scope", "$filter", "ngTableParams", "API if (response.data.changePassStatus == true) { // SweetAlert.swal("Hello!", "Password changed Succesfully"); // $state.go($state.current, {}, { reload: true }); - swal("Success!", response.data.message, "success"); + swal(" ", "Password Changed successfully.", "success"); form.$setPristine(true); $scope.myModel = { curr: "", @@ -59,7 +59,7 @@ app.controller('changePasswordCtrl', ["$scope", "$filter", "ngTableParams", "API password2: "" }; } else { - swal("Warning!", response.data.message, "warning"); + swal(" ", response.data.message, "warning"); // $state.go($state.current, {}, { reload: true }); } }, function (error) { diff --git a/Apollo/assets/js/controllers/courseCtrl.js b/Apollo/assets/js/controllers/courseCtrl.js index 7997f9ae..3a8623f4 100755 --- a/Apollo/assets/js/controllers/courseCtrl.js +++ b/Apollo/assets/js/controllers/courseCtrl.js @@ -179,12 +179,12 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab $http(addCourse).then(function (response) { if (response.data.status==200 && response.data.courseStatus) { $scope.ldloading1[loading.replace('-', '_')] = false; - swal("Success!", response.data.message, "success"); + swal(" ", "COurse added successfully.", "success"); $state.go($state.current, {}, {reload: true}); } else { $scope.addMoreItems.splice($scope.addMoreItems.length-1); $scope.ldloading1[loading.replace('-', '_')] = false; - swal("Failed!", response.data.message, "error"); + swal(" ", response.data.message, "error"); } }); } @@ -269,7 +269,7 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab $scope.ldloading[loading.replace('-', '_')] = false; $rootScope.updateMoreItems=[]; $rootScope.init(); - swal("Success!", response.data.message, "success"); + swal(" ", "Updated successfully.", "success"); $scope.editId = -1; @@ -277,7 +277,7 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab } else { $scope.ldloading[loading.replace('-', '_')] = false; // $rootScope.init(); - swal("Failed!", response.data.message, "error"); + swal(" ", response.data.message, "error"); } }); } diff --git a/Apollo/assets/js/controllers/dayBookMasterCtrl.js b/Apollo/assets/js/controllers/dayBookMasterCtrl.js index b0da3021..b3ee320a 100755 --- a/Apollo/assets/js/controllers/dayBookMasterCtrl.js +++ b/Apollo/assets/js/controllers/dayBookMasterCtrl.js @@ -83,11 +83,11 @@ app.controller("dayBookMasterCtrl", ["$scope", "toaster", "$filter", "API_POINTS if (response.data.status == 200 && response.data.addStatus) { $scope.ldloading1[loading.replace('-', '_')] = false; $scope.init(); - swal("Success!", response.data.message, "success"); + swal(" ", "Income/Expense added successfullly.", "success"); $state.go($state.current, {}, { reload: true }); } else { $scope.ldloading1[loading.replace('-', '_')] = false; - swal("Failed!", response.data.message, "error"); + swal(" ", response.data.message, "error"); } }); @@ -190,13 +190,13 @@ app.controller("dayBookMasterCtrl", ["$scope", "toaster", "$filter", "API_POINTS $http(update).then(function (response) { if (response.data.status==200 && response.data.updateStatus) { $scope.ldloading[loading.replace('-', '_')] = false; - swal("Success!", response.data.message, "success"); + swal( "", "Updated successfully.", "success"); $scope.editId = -1; $scope.init(); } else { $scope.ldloading[loading.replace('-', '_')] = false; - swal("Failed!", response.data.message, "error"); + swal(" ", response.data.message, "error"); } }); diff --git a/Apollo/assets/js/controllers/daybookCtrl.js b/Apollo/assets/js/controllers/daybookCtrl.js index 06cf009e..3818c2f3 100755 --- a/Apollo/assets/js/controllers/daybookCtrl.js +++ b/Apollo/assets/js/controllers/daybookCtrl.js @@ -243,10 +243,10 @@ $scope.dayBookApprovalAccess = ''; }; $http(deleteDetails).then(function (response) { if (response.data.deletedStatus) { - swal("Success!", response.data.message, "success"); + swal(" ", "Deleted Successfully.", "success"); $scope.getDayBookList(); } else { - swal("Failed!", response.data.message, "error"); + swal(" ", response.data.message, "error"); } }); } @@ -302,10 +302,10 @@ $scope.dayBookApprovalAccess = ''; }; $http(addDayBookDetails).then(function (response) { if (response.data.addDayBookStatus) { - swal("Success!", response.data.message, "success"); + swal(" ", "Income/Expense added successfully.", "success"); $state.go($state.current, {}, { reload: true }); } else { - swal("Failed!", response.data.message, "error"); + swal(" ", response.data.message, "error"); } }); } @@ -359,12 +359,12 @@ $scope.dayBookApprovalAccess = ''; }; $http(updateDayBookDetails).then(function (response) { if (response.data.updateDetailsStatus) { - swal("Success!", response.data.message, "success"); + swal(" ","Updated successfully.", "success"); // for success state $scope.editId = -1; $scope.getDayBookList(); } else { - swal("Failed!", response.data.message, "error"); + swal(" ", response.data.message, "error"); } }); } diff --git a/Apollo/assets/js/controllers/daybookadminCtrl.js b/Apollo/assets/js/controllers/daybookadminCtrl.js index 5724d992..4ae71ffa 100755 --- a/Apollo/assets/js/controllers/daybookadminCtrl.js +++ b/Apollo/assets/js/controllers/daybookadminCtrl.js @@ -290,17 +290,17 @@ app.controller('daybookadminCtrl', ["$scope", "$rootScope", "toaster", "$filter" }; $http(updateStudyMaterial).then(function (response) { if (response.data.addStatus) { - swal("Success!", response.data.message, "success"); + swal(" ", "Updated successfully.", "success"); // for success state $scope.getDayBookList(); $scope.allSelected('undefined'); $scope.OpenWindowStatus = false; } else { - swal("Failed!", response.data.message, "error"); + swal(" ", response.data.message, "error"); } }); } else { - swal("Warning!", "Item not Selected", "warning"); + swal(" ", "Item not Selected", "warning"); } } }, @@ -463,7 +463,7 @@ app.controller('daybookadminCtrl', ["$scope", "$rootScope", "toaster", "$filter" let ans = $scope.data.some(function (val, i) { if (val.id === id) { $scope.data.splice(i, 1); - swal("Deleted!", "Your record has been deleted.", "success"); + swal(" ", "Your record has been deleted.", "success"); return true; } }); return ans; diff --git a/Apollo/assets/js/controllers/daybookapprovalCtrl.js b/Apollo/assets/js/controllers/daybookapprovalCtrl.js index 74e2168a..32398f92 100644 --- a/Apollo/assets/js/controllers/daybookapprovalCtrl.js +++ b/Apollo/assets/js/controllers/daybookapprovalCtrl.js @@ -290,17 +290,17 @@ app.controller('daybookapprovalCtrl', ["$scope", "$rootScope", "toaster", "$filt }; $http(updateStudyMaterial).then(function (response) { if (response.data.addStatus) { - swal("Success!", response.data.message, "success"); + swal(" ", "Updated successfully,", "success"); // for success state $scope.getDayBookList(); $scope.allSelected('undefined'); $scope.OpenWindowStatus = false; } else { - swal("Failed!", response.data.message, "error"); + swal(" ", response.data.message, "error"); } }); } else { - swal("Warning!", "Item not Selected", "warning"); + swal(" ", "Item not Selected", "warning"); } } diff --git a/Apollo/assets/js/controllers/daybooksuperadminCtrl.js b/Apollo/assets/js/controllers/daybooksuperadminCtrl.js index 03f1bda6..36bfc7d6 100755 --- a/Apollo/assets/js/controllers/daybooksuperadminCtrl.js +++ b/Apollo/assets/js/controllers/daybooksuperadminCtrl.js @@ -248,13 +248,13 @@ app.controller('daybooksuperadminCtrl', ["$scope", "$rootScope", "toaster", "$fi }; $http(updateStudyMaterial).then(function (response) { if (response.data.addStatus) { - swal("Success!", response.data.message, "success"); + swal(" ", "Updated successfully.", "success"); // for success state $scope.getDayBookList(); $scope.allSelected('undefined'); $scope.OpenWindowStatus = false; } else { - swal("Failed!", response.data.message, "error"); + swal(" ", response.data.message, "error"); } }); } diff --git a/Apollo/assets/js/controllers/employeeCtrl.js b/Apollo/assets/js/controllers/employeeCtrl.js index a4c85042..bcff7819 100755 --- a/Apollo/assets/js/controllers/employeeCtrl.js +++ b/Apollo/assets/js/controllers/employeeCtrl.js @@ -271,7 +271,7 @@ app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$ }; $http(checkReq).then(function (response) { if (response.data.existEmpId == true) { - swal("Warning!", response.data.message, "warning"); + swal("", response.data.message, "warning"); $scope.myModel.employeeId = ''; } else { } @@ -293,7 +293,7 @@ app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$ }; $http(checkReq).then(function (response) { if (response.data.existMobile == true) { - swal("Warning!", response.data.message, "warning"); + swal("", response.data.message, "warning"); $scope.myModel.primaryPhone = ''; } else { } @@ -315,7 +315,7 @@ app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$ }; $http(checkReq).then(function (response) { if (response.data.existEmailId == true) { - swal("Warning!", response.data.message, "warning"); + swal("", response.data.message, "warning"); $scope.myModel.emailId = ''; } else { } @@ -434,7 +434,7 @@ app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$ }; $http(req).then(function (response) { if (response.data.addEmpStatus == true) { - swal("Success!", response.data.message, "success"); + swal("Success!", "Employee details added successfully.", "success"); $state.go($state.current, {}, { reload: true }); } else { // $scope.ldloading1[loading.replace('-', '_')] = false; @@ -494,7 +494,7 @@ app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$ }; $http(checkReq).then(function (response) { if (response.data.existMobile == true) { - swal("Warning!", response.data.message, "warning"); + swal("", response.data.message, "warning"); p.MobileNumber = response.data.resetValue.MobileNumber; } else { } @@ -516,7 +516,7 @@ app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$ }; $http(checkReq).then(function (response) { if (response.data.existEmailId == true) { - swal("Warning!", response.data.message, "warning"); + swal("", response.data.message, "warning"); p.EmailID = response.data.resetValue.EmailID; } else { } @@ -569,12 +569,12 @@ app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$ }; $http(req).then(function (response) { if (response.data.updateEmpStatus = true) { - swal("Success!", response.data.message, "success"); + swal("", "Updated Successfully.", "success"); $scope.getEmployeeList(); $scope.editId = -1; } else { // $scope.ldloading1[loading.replace('-', '_')] = false; - swal("Failed!", response.data.message, "error"); + swal("", response.data.message, "error"); } }); } else { @@ -591,12 +591,12 @@ app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$ headers: { 'Content-Type': undefined, 'Process-Data': false }, }).success(function (data) { if (data.updateEmpStatus == true) { - swal("Success!", data.message, "success"); + swal("", "Updated Successfully.", "success"); $scope.getEmployeeList(); $scope.editId = -1; } else { // $scope.ldloading1[loading.replace('-', '_')] = false; - swal("Failed!", data.message, "error"); + swal("", data.message, "error"); } }); } @@ -652,12 +652,12 @@ app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$ }; $http(req).then(function (response) { if (response.data.updateEmpbranchStatus = true) { - swal("Success!", response.data.message, "success"); + swal("", "Updated Successfully.", "success"); $scope.getEmployeeList(); $scope.editBranchId = -1; } else { // $scope.ldloading1[loading.replace('-', '_')] = false; - swal("Failed!", response.data.message, "error"); + swal("", response.data.message, "error"); } }); } diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js index 41c75b51..ad3cc579 100755 --- a/Apollo/assets/js/controllers/feesStatusCtrl.js +++ b/Apollo/assets/js/controllers/feesStatusCtrl.js @@ -248,7 +248,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n $http(updateFees).then(function (response) { if (response.data.status==200 && response.data.paidStatus) { $scope.ldloading[loading.replace('-', '_')] = false; - swal("Success!", response.data.message, "success"); + swal("Success!", "Updated successfully.", "success"); /*$scope.updateModel = { "feesType": "", "date": "", @@ -362,7 +362,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n $http(updateFees).then(function (response) { if (response.data.status==200 && response.data.setStatus) { $scope.ldloading5[loading.replace('-', '_')] = false; - swal("Success!", response.data.message, "success"); + swal("Success!", "Fees set successfully.", "success"); $scope.getStudentSetFees(myModel.ID,myModel.CourseID,myModel.StudentID); /*$scope.setModel = { diff --git a/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js b/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js index ab0f5c22..8086e187 100644 --- a/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js +++ b/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js @@ -219,14 +219,14 @@ app.controller('sendSMSsuperadminCtrl', ["$scope", "$filter", "ngTableParams", " }; $http(sendMSGApi).then(function (response) { if (response.data.msgStatus) { - swal("Success!", response.data.message, "success"); + swal(" ", "Message sent successfully.", "success"); $scope.disableButton = false; angular.forEach($scope.searchResultDetails, function (item) { item.Selected = false; }); $scope.OpenWindowStatus = false; } else { - swal("Failed!", response.data.message, "error"); + swal(" ", response.data.message, "error"); $scope.disableButton = false; } }); diff --git a/Apollo/assets/js/controllers/statusCtrl.js b/Apollo/assets/js/controllers/statusCtrl.js index 35d9737f..44f23aca 100755 --- a/Apollo/assets/js/controllers/statusCtrl.js +++ b/Apollo/assets/js/controllers/statusCtrl.js @@ -81,11 +81,11 @@ $scope.statusForm = { if (response.data.status == 200 && response.data.Status) { $scope.ldloading1[loading.replace('-', '_')] = false; $scope.init(); - swal("Success!", response.data.message, "success"); + swal(" ", "Status added successfully.", "success"); $state.go($state.current, {}, { reload: true }); } else { $scope.ldloading1[loading.replace('-', '_')] = false; - swal("Failed!", response.data.message, "error"); + swal("", "Something went wrong, please try again.", "error"); } }); @@ -189,13 +189,13 @@ $scope.statusForm = { $http(update).then(function (response) { if (response.data.status==200 && response.data.Status) { $scope.ldloading[loading.replace('-', '_')] = false; - swal("Success!", response.data.message, "success"); + swal("", "Updated Successfully", "success"); $scope.editId = -1; $scope.init(); } else { $scope.ldloading[loading.replace('-', '_')] = false; - swal("Failed!", response.data.message, "error"); + swal("", "Something went wrong, please try again", "error"); } }); diff --git a/Apollo/assets/js/controllers/studentCtrl.js b/Apollo/assets/js/controllers/studentCtrl.js index 0c803f66..65a03902 100755 --- a/Apollo/assets/js/controllers/studentCtrl.js +++ b/Apollo/assets/js/controllers/studentCtrl.js @@ -274,10 +274,10 @@ $scope.studentListLength = 0; }; $http(req).then(function (response) { if (response.data.addStuCourseStatus == true) { - swal("Success!", response.data.message, "success"); + swal(" ","Student course added successfully.", "success"); $scope.getStudentCourseList($scope.currentStudentId); } else { - swal("Failed!", response.data.message, "error"); + swal(" ", response.data.message, "error"); $scope.getStudentCourseList($scope.currentStudentId); } }); @@ -374,12 +374,12 @@ $scope.studentListLength = 0; }; $http(req).then(function (response) { if (response.data.updateStuCourseStatus) { - swal("Success!", response.data.message, "success"); + swal(" ", "Updated successfully.", "success"); $scope.getStudentCourseList($scope.currentStudentId); // $scope.editCourseId = false; } else { // $scope.ldloading1[loading.replace('-', '_')] = false; - swal("Failed!", response.data.message, "error"); + swal(" ", response.data.message, "error"); $scope.getStudentCourseList($scope.currentStudentId); } }); @@ -605,12 +605,12 @@ $scope.studentListLength = 0; headers: { 'Content-Type': undefined, 'Process-Data': false }, }).success(function (data) { if (data.addStudentStatus == true) { - swal("Success!", data.message, "success"); + swal(" ", "Student picture added successfully.", "success"); $scope.disableButton = false; $state.go($state.current, {}, { reload: true }); } else { // $scope.ldloading1[loading.replace('-', '_')] = false; - swal("Failed!", data.message, "error"); + swal(" ", data.message, "error"); // $scope.disableButton = false; } }); @@ -630,12 +630,12 @@ $scope.studentListLength = 0; }; $http(req).then(function (response) { if (response.data.addStudentStatus == true) { - swal("Success!", response.data.message, "success"); + swal(" ", "Student added successfully.", "success"); $scope.disableButton = false; $state.go($state.current, {}, { reload: true }); } else { // $scope.disableButton = false; - swal("Failed!", response.data.message, "error"); + swal(" ", response.data.message, "error"); } }); } @@ -818,12 +818,12 @@ $scope.studentListLength = 0; }; $http(req).then(function (response) { if (response.data.updateStuStatus = true) { - swal("Success!", response.data.message, "success"); + swal(" ", "Updated successfully.", "success"); $scope.getStudentList(); $scope.editId = -1; } else { // $scope.ldloading1[loading.replace('-', '_')] = false; - swal("Failed!", response.data.message, "error"); + swal(" ", response.data.message, "error"); } }); } else { @@ -839,12 +839,12 @@ $scope.studentListLength = 0; headers: { 'Content-Type': undefined, 'Process-Data': false }, }).success(function (data) { if (data.updateStuStatus == true) { - swal("Success!", data.message, "success"); + swal(" ","Updated successfully." , "success"); $scope.getStudentList(); $scope.editId = -1; } else { // $scope.ldloading1[loading.replace('-', '_')] = false; - swal("Failed!", data.message, "error"); + swal(" ", data.message, "error"); } }); } @@ -1155,10 +1155,10 @@ $scope.myUnivSearch = ""; }; $http(req).then(function (response) { if (response.data.addStuCourseStatus == true) { - swal("Success!", response.data.message, "success"); + swal(" ","Student course added successfully. ", "success"); $scope.getStudentCourseList($scope.currentStudentId); } else { - swal("Failed!", response.data.message, "error"); + swal(" ", response.data.message, "error"); $scope.getStudentCourseList($scope.currentStudentId); } }); @@ -1255,12 +1255,12 @@ $scope.myUnivSearch = ""; }; $http(req).then(function (response) { if (response.data.updateStuCourseStatus) { - swal("Success!", response.data.message, "success"); + swal("", "Updated successfully.", "success"); $scope.getStudentCourseList($scope.currentStudentId); // $scope.editCourseId = false; } else { // $scope.ldloading1[loading.replace('-', '_')] = false; - swal("Failed!", response.data.message, "error"); + swal(" ", response.data.message, "error"); $scope.getStudentCourseList($scope.currentStudentId); } }); @@ -1541,7 +1541,7 @@ $scope.myUnivSearch = ""; headers: { 'Content-Type': undefined, 'Process-Data': false }, }).success(function (data) { if (data.addStudentStatus == true) { - swal("Success!", data.message, "success"); + swal(" ", "Student picture added successfully.", "success"); $scope.disableButton = false; $scope.viewStudentDetailsPage = false; // $state.go($state.current, {}, { reload: true }); @@ -1551,7 +1551,7 @@ $scope.myUnivSearch = ""; // $scope.tabActive('tabactive1'); } else { // $scope.ldloading1[loading.replace('-', '_')] = false; - swal("Failed!", data.message, "error"); + swal(" ", data.message, "error"); } }); } else { @@ -1570,7 +1570,7 @@ $scope.myUnivSearch = ""; }; $http(req).then(function (response) { if (response.data.addStudentStatus == true) { - swal("Success!", response.data.message, "success"); + swal( "", "Student added successfully.", "success"); $scope.disableButton = false; $scope.viewStudentDetailsPage = false; // $state.go($state.current, {}, { reload: true }); @@ -1581,7 +1581,7 @@ $scope.myUnivSearch = ""; // $scope.tabActive('tabactive1'); } else { // $scope.disableButton = false; - swal("Failed!", response.data.message, "error"); + swal(" ", response.data.message, "error"); } }); } @@ -1764,12 +1764,12 @@ $scope.myUnivSearch = ""; }; $http(req).then(function (response) { if (response.data.updateStuStatus = true) { - swal("Success!", response.data.message, "success"); + swal(" ", "Updated successfully.", "success"); $scope.getStudentList(); $scope.editId = -1; } else { // $scope.ldloading1[loading.replace('-', '_')] = false; - swal("Failed!", response.data.message, "error"); + swal(" ", response.data.message, "error"); } }); } else { @@ -1785,12 +1785,12 @@ $scope.myUnivSearch = ""; headers: { 'Content-Type': undefined, 'Process-Data': false }, }).success(function (data) { if (data.updateStuStatus == true) { - swal("Success!", data.message, "success"); + swal(" ", "Updated successfully.", "success"); $scope.getStudentList(); $scope.editId = -1; } else { // $scope.ldloading1[loading.replace('-', '_')] = false; - swal("Failed!", data.message, "error"); + swal(" ", data.message, "error"); } }); } diff --git a/Apollo/assets/js/controllers/studentStatusUpdateCtrl.js b/Apollo/assets/js/controllers/studentStatusUpdateCtrl.js index a7bf5910..a40fd610 100755 --- a/Apollo/assets/js/controllers/studentStatusUpdateCtrl.js +++ b/Apollo/assets/js/controllers/studentStatusUpdateCtrl.js @@ -137,14 +137,14 @@ app.controller("studentStatusUpdateCtrl", ["$scope", "toaster", "$filter", "API_ if (response.data.status==200 && response.data.activityStatus) { $scope.ldloading3[loading.replace('-', '_')] = false; - swal("Success!", response.data.message, "success"); + swal("", "Status Updated Successfully.", "success"); $scope.init(); $scope.editId = -1; } else { $scope.ldloading3[loading.replace('-', '_')] = false; - swal("Failed!", response.data.message, "error"); + swal(" ", " Something went wrong, please try again.", "error"); } }); } diff --git a/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js b/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js index 1102a67d..36b8aade 100755 --- a/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js +++ b/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js @@ -342,7 +342,7 @@ app.controller('studyMaterialStatusCtrl', ["$scope", "toaster", "$filter", "ngTa }; $http(updateStudyMaterial).then(function (response) { if (response.data.addStatus) { - swal("Success!", response.data.message, "success"); + swal(" ", "Updated successfully.", "success"); $scope.disableButton = false; // for success state // $scope.allSelected('undefined'); @@ -351,7 +351,7 @@ app.controller('studyMaterialStatusCtrl', ["$scope", "toaster", "$filter", "ngTa }); $scope.OpenWindowStatus = false; } else { - swal("Failed!", response.data.message, "error"); + swal(" ", response.data.message, "error"); $scope.disableButton = false; } }); diff --git a/Apollo/assets/js/controllers/universityCtrl.js b/Apollo/assets/js/controllers/universityCtrl.js index b13bb0a7..c193cc89 100755 --- a/Apollo/assets/js/controllers/universityCtrl.js +++ b/Apollo/assets/js/controllers/universityCtrl.js @@ -9,7 +9,6 @@ app.controller('universityCtrl', ["$scope", "toaster", "$filter", "ngTableParams * university details capture * by : kdk */ - // get local cliend details var localDetail = JSON.parse(localStorage.getItem('localObj')); var localDetails = ipCookie('cookiechk'); @@ -75,7 +74,7 @@ app.controller('universityCtrl', ["$scope", "toaster", "$filter", "ngTableParams }; $http(checkReq).then(function (response) { if (response.data.existUniv === true) { - swal("Warning!", response.data.message, "warning"); + swal("", "University Id already exists", "warning"); $scope.myModel.UniversityID = ''; } else { } @@ -123,12 +122,12 @@ app.controller('universityCtrl', ["$scope", "toaster", "$filter", "ngTableParams }; $http(req).then(function (response) { if (response.data.updateUniversityStatus = true) { - swal("Success!", response.data.message, "success"); + swal(" ", "Updated successfully.", "success"); $scope.getUniversityList(); $scope.editId = -1; } else { // $scope.ldloading1[loading.replace('-', '_')] = false; - swal("Failed!", response.data.message, "error"); + swal(" ", "Something went wrong, please try again.", "error"); } }); } @@ -167,11 +166,11 @@ app.controller('universityCtrl', ["$scope", "toaster", "$filter", "ngTableParams }; $http(req).then(function (response) { if (response.data.addUniv == true) { - swal("Success!", response.data.message, "success"); + swal("", "University details added successfully.", "success"); $state.go($state.current, {}, { reload: true }); } else { // $scope.ldloading1[loading.replace('-', '_')] = false; - swal("Failed!", response.data.message, "error"); + swal("","Something went wrong, please try again.", "error"); } }); } diff --git a/Apollo/assets/views/activity.html b/Apollo/assets/views/activity.html index dbe0dea6..7b97fccb 100755 --- a/Apollo/assets/views/activity.html +++ b/Apollo/assets/views/activity.html @@ -11,10 +11,10 @@
-

- +

+ + Add / Edit Activity list used for call tracking. +
@@ -91,7 +91,7 @@ Submit --> @@ -137,7 +137,7 @@ {{p.ActivityID}} {{p.ActivityName}} {{p.Description}} - Active De-Active + Active In-Active diff --git a/Apollo/assets/views/announcement/Announcement.html b/Apollo/assets/views/announcement/Announcement.html index 2d402cd2..742906a4 100755 --- a/Apollo/assets/views/announcement/Announcement.html +++ b/Apollo/assets/views/announcement/Announcement.html @@ -12,8 +12,8 @@
-

{{ mainTitle }}

- +

{{ mainTitle }}

+ Add/View Announcement Details.
@@ -59,7 +59,7 @@ - - + @@ -112,22 +112,22 @@
- Heading is required + ng-if="Form.Heading.$dirty && Form.Heading.$error.required">Title is required
diff --git a/Apollo/assets/views/announcement/editAnnouncementDetails.html b/Apollo/assets/views/announcement/editAnnouncementDetails.html index 46be6f91..54e2fd8a 100755 --- a/Apollo/assets/views/announcement/editAnnouncementDetails.html +++ b/Apollo/assets/views/announcement/editAnnouncementDetails.html @@ -16,15 +16,15 @@
- Heading is required + ng-if="Form.Heading.$dirty && Form.Heading.$error.required">Title is required
@@ -35,7 +35,7 @@
diff --git a/Apollo/assets/views/batch.html b/Apollo/assets/views/batch.html index dbf4de72..b6127cd4 100755 --- a/Apollo/assets/views/batch.html +++ b/Apollo/assets/views/batch.html @@ -12,10 +12,10 @@
-

- +

+ + Add/View Batch Details. +
@@ -82,7 +82,7 @@
- + - + @@ -184,7 +184,7 @@ - Email is required. + Email is required.Please, enter a valid email address. diff --git a/Apollo/assets/views/callTrackingCloseDetails.html b/Apollo/assets/views/callTrackingCloseDetails.html index d60e2fc8..fe285c3a 100755 --- a/Apollo/assets/views/callTrackingCloseDetails.html +++ b/Apollo/assets/views/callTrackingCloseDetails.html @@ -22,10 +22,9 @@
-

{{ mainTitle }}

- +

{{ mainTitle }}

+ View all closed leads. +
@@ -69,17 +68,17 @@ - - - - @@ -87,8 +86,8 @@ - - + + @@ -97,10 +96,10 @@ diff --git a/Apollo/assets/views/callTrackingDetails.html b/Apollo/assets/views/callTrackingDetails.html index b200dd77..fe1644d3 100755 --- a/Apollo/assets/views/callTrackingDetails.html +++ b/Apollo/assets/views/callTrackingDetails.html @@ -22,10 +22,10 @@
-

{{ mainTitle }}

- +

{{ mainTitle }}

+ + Manage new leads. +
@@ -88,19 +88,19 @@
- +
- +
- +
- +


@@ -129,25 +129,24 @@ - - - - - - + + @@ -155,10 +154,10 @@ @@ -333,7 +332,7 @@
Date is required. + ng-if="Form.date.$dirty && Form.date.$error.required">Followup Date is required.
diff --git a/Apollo/assets/views/callTrackingLeadDetails.html b/Apollo/assets/views/callTrackingLeadDetails.html index 3112a6b4..ec7a9f51 100755 --- a/Apollo/assets/views/callTrackingLeadDetails.html +++ b/Apollo/assets/views/callTrackingLeadDetails.html @@ -22,10 +22,10 @@
-

{{ mainTitle }}

- +

{{ mainTitle }}

+ + Leads created on a given date. +
@@ -69,17 +69,17 @@ - - - - @@ -87,8 +87,8 @@ - - + + @@ -96,10 +96,10 @@ diff --git a/Apollo/assets/views/callTrackingPendingDetails.html b/Apollo/assets/views/callTrackingPendingDetails.html index 58151cda..ff243e80 100755 --- a/Apollo/assets/views/callTrackingPendingDetails.html +++ b/Apollo/assets/views/callTrackingPendingDetails.html @@ -22,10 +22,10 @@
-

{{ mainTitle }}

- +

{{ mainTitle }}

+ + View all pending leads. +
@@ -69,17 +69,17 @@ - - - - @@ -87,8 +87,8 @@ - - + + @@ -96,10 +96,10 @@ diff --git a/Apollo/assets/views/courseDetails.html b/Apollo/assets/views/courseDetails.html index 5e3daa9d..354b77c1 100755 --- a/Apollo/assets/views/courseDetails.html +++ b/Apollo/assets/views/courseDetails.html @@ -12,10 +12,10 @@
-

{{ mainTitle }}

- +

{{ mainTitle }}

+ + Add/View Course Details. +
@@ -78,10 +78,10 @@
- + - +
Heading + Title Active De-Active Active In-Active {{p.BatchCode}} {{p.BatchName}} {{p.UniversityName}} Active De-Active Active In-Active diff --git a/Apollo/assets/views/branchDetails.html b/Apollo/assets/views/branchDetails.html index 96b59912..a02c6464 100755 --- a/Apollo/assets/views/branchDetails.html +++ b/Apollo/assets/views/branchDetails.html @@ -10,10 +10,10 @@
-

{{ mainTitle }}

- +

{{ mainTitle }}

+ + Add/View Branch Details. +
@@ -98,7 +98,7 @@
{{p.MobileNumber}} {{p.LandlineNumber}} Active De-Active Active In-Active
Tracking ID + ID Followup On + Followup Student Name + Name Mobile Number + Mobile Course Activity Assigned ToCreated OnAssigned Created Status
- + - + {{p.TrackingID}}
Tracking ID + ID Followup On + Followup Student Name + Name Mobile Number + Mobile University CourseActivity - Assigned ToActivity Assigned Status
- + - + {{p.TrackingID}} {{p.followupDetails }}
Tracking ID + ID Followup On + Followup Student Name + Name Mobile Number + Mobile Course Activity Assigned ToCreated OnAssigned Created Status
- + - + {{p.TrackingID}} {{p.followupDetails }}
Tracking ID + ID Followup On + Followup Student Name + Name Mobile Number + Mobile Course Activity Assigned ToCreated OnAssignedCreated Status
- + - + {{p.TrackingID}} {{p.followupDetails }}
{{p.CourseID}}{{p.CourseCode}} {{p.CourseName}} {{p.UniversityName}} Active De-Active Active In-Active diff --git a/Apollo/assets/views/dashboard.html b/Apollo/assets/views/dashboard.html index d24ebfa1..9ee52f8b 100755 --- a/Apollo/assets/views/dashboard.html +++ b/Apollo/assets/views/dashboard.html @@ -4,23 +4,26 @@ } -
+
+
+
+
-

Today Follow Up Details

+

Follow Ups For Today : {{todayFolloupDetails.length}}

@@ -32,11 +35,11 @@
- + - - - + + + @@ -61,11 +64,58 @@ + + +
+
+
+

Leads Created Today :{{leadDetails.length}}

+ +
+
+
+
+
No Lead Created By Today!
+
+
+
+
Total Entries :{{todayFolloupDetails.length}}
Tracking IDLead NameMobile No ID NameMobile Activity Status
+ + + + + + + + + + + + + + + + + + + + + + + + + +
ID NameMobile ActivityFollowup Status
{{lead.TrackingID}}{{lead.LeadName}}{{lead.MobileNumber}}{{lead.ActivityName}}{{lead.FollowupOn}}
+
+
+
+
+
-

Pending Follow Up Details

+

Pending Follow Ups :{{pendingFolloupDetails.length}}

@@ -74,16 +124,17 @@
No Pending Followup!
-
+
- + + - - - + + + - + @@ -108,10 +159,10 @@
-
+ +
{{total}} -
-
- + -->
diff --git a/Apollo/assets/views/daybook/dayBookApproval.html b/Apollo/assets/views/daybook/dayBookApproval.html index efc69a7d..3c2b125a 100644 --- a/Apollo/assets/views/daybook/dayBookApproval.html +++ b/Apollo/assets/views/daybook/dayBookApproval.html @@ -2,7 +2,7 @@
-

{{ mainTitle }}

+

{{ mainTitle }}

@@ -144,7 +144,7 @@
-
Total Entries :{{pendingFolloupDetails.length}}
Tracking IDLead NameMobile No ID NameMobile ActivityFollowup OnFollowup Status
+
@@ -169,9 +169,7 @@ - + @@ -188,19 +186,19 @@ - + @@ -291,19 +287,19 @@ -
Amount Comments - -
- {{p.PaidDescription}} + {{p.PaidDescription}} / {{p.Description}}
{{p.TypeName}} {{p.Amount}} + - Comments - - Status
- {{p.PaidDescription}} + {{p.PaidDescription}} / {{p.Description}}
{{p.TypeName}} {{p.Amount}} + {{p.Status}} {{p.Status}} {{p.Status}} @@ -358,7 +354,7 @@ - Permanent Address is required - -
- - - Current Address is required -
+ +
+
+ + + Permanent Address is required +
+
+ + + Current Address is required +
+
+
@@ -346,7 +351,7 @@ Date Of Joining - @@ -355,14 +360,14 @@ is-open="startOpen" ng-init="startOpen = false" name="dateofjoining" datepicker-options="dateOptions" placeholder="Select Date of Joining" close-text="Close" required="required" />--> - Date of Joining required + Date of Joining is required
-
+
@@ -387,7 +392,7 @@
-->
-
+