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

naming changes

Browse Source
This commit is contained in:
saravanakumar_kandasami 2018-02-01 16:48:14 +05:30
parent df9407073d
commit 5c27be6fef
67 changed files with 671 additions and 603 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Apollo/api/application/config/database.php
View File

@ -76,9 +76,9 @@ $query_builder = TRUE;
$db['default'] = array( $db['default'] = array(
'dsn' => '', 'dsn' => '',
'hostname' => 'apollodec.com', 'hostname' => 'apollodec.com',
'username' => 'apollod4_DEV', 'username' => 'apollod4_SIT',
'password' => 'apollo1234', 'password' => 'apollosit1234',
'database' => 'apollod4_ApolloDECDev', 'database' => 'apollod4_ApolloDECSIT',
'dbdriver' => 'mysqli', 'dbdriver' => 'mysqli',
'dbprefix' => '', 'dbprefix' => '',
'pconnect' => FALSE, 'pconnect' => FALSE,

5
Apollo/api/application/controllers/Course_Controller.php
View File

@ -33,7 +33,7 @@ class Course_Controller extends REST_Controller {
{ {
$now = new DateTime(); $now = new DateTime();
$now->setTimezone(new DateTimezone('Asia/Kolkata')); $now->setTimezone(new DateTimezone('Asia/Kolkata'));
$details['CourseID'] = $this->post('courseID'); $details['CourseCode'] = $this->post('courseCode');
$details['CourseName'] = $this->post('courseName'); $details['CourseName'] = $this->post('courseName');
$details['UniversityID'] = $this->post('universityName'); $details['UniversityID'] = $this->post('universityName');
$details['Specilization1'] = $this->post('specilization1'); $details['Specilization1'] = $this->post('specilization1');
@ -131,7 +131,8 @@ class Course_Controller extends REST_Controller {
{ {
$now = new DateTime(); $now = new DateTime();
$now->setTimezone(new DateTimezone('Asia/Kolkata')); $now->setTimezone(new DateTimezone('Asia/Kolkata'));
$details['CourseID'] = $this->post('courseCode'); $details['CourseID'] = $this->post('courseID');
$details['CourseCode'] = $this->post('courseCode');
$details['CourseName'] = $this->post('courseName'); $details['CourseName'] = $this->post('courseName');
$details['Specilization1'] = $this->post('specilization1'); $details['Specilization1'] = $this->post('specilization1');
$details['Specilization2'] = $this->post('specilization2'); $details['Specilization2'] = $this->post('specilization2');

2
Apollo/api/application/models/Batch_model.php
View File

@ -22,7 +22,7 @@ class Batch_model extends CI_Model {
$this->db->where('BatchCode', $arrayDetails['BatchCode']); $this->db->where('BatchCode', $arrayDetails['BatchCode']);
if($this->db->get(BATCH)->first_row()){ if($this->db->get(BATCH)->first_row()){
$result['batchStatus'] = false; $result['batchStatus'] = false;
$result['message'] = "This batch Code is already exist!"; $result['message'] = "This batch code is already exist.";
} else { } else {
$this->db->insert(BATCH, $arrayDetails); $this->db->insert(BATCH, $arrayDetails);
if ($this->db->affected_rows() == '1') { if ($this->db->affected_rows() == '1') {

75
Apollo/api/application/models/Course_model.php
View File

@ -18,19 +18,19 @@ class Course_model extends CI_Model {
public function addCourse($arrayDetails=null,$jsonSemFeesData=null) public function addCourse($arrayDetails=null,$jsonSemFeesData=null)
{ {
$this->db->select('CourseID'); $this->db->select('CourseCode');
$this->db->where('CourseID', $arrayDetails['CourseID']); $this->db->where('CourseCode', $arrayDetails['CourseCode']);
if($this->db->get(COURSE)->first_row()){ if($this->db->get(COURSE)->first_row()){
$result['courseStatus'] = false; $result['courseStatus'] = false;
$result['message'] = "This course id is already exist!"; $result['message'] = "This course id is already exist!";
} else { } else {
$this->db->insert(COURSE, $arrayDetails); $this->db->insert(COURSE, $arrayDetails);
if ($this->db->affected_rows() == '1') { if ($this->db->affected_rows() == '1') {
$insert_id = $this->db->insert_id();
if($jsonSemFeesData){ if($jsonSemFeesData){
foreach($jsonSemFeesData as $row){ foreach($jsonSemFeesData as $row){
$insertFeesArray['CourseID'] =$arrayDetails['CourseID']; $insertFeesArray['CourseID'] =$insert_id;
$insertFeesArray['ProgramType'] =$row['program']; $insertFeesArray['ProgramType'] =$row['program'];
$insertFeesArray['FeesType'] =$row['FeesType']; $insertFeesArray['FeesType'] =$row['FeesType'];
$insertFeesArray['FeesAmount'] =$row['FeesAmount']; $insertFeesArray['FeesAmount'] =$row['FeesAmount'];
@ -44,7 +44,7 @@ class Course_model extends CI_Model {
$result['message'] = "Successfully course details added"; $result['message'] = "Successfully course details added";
} }
else{ else{
$this -> db -> where('CourseID', $arrayDetails['CourseID']); $this -> db -> where('CourseCode', $arrayDetails['CourseCode']);
$this -> db -> delete('COURSE'); $this -> db -> delete('COURSE');
$result['courseStatus'] = false; $result['courseStatus'] = false;
$result['message'] = "Something went wrong.please try again"; $result['message'] = "Something went wrong.please try again";
@ -69,7 +69,7 @@ class Course_model extends CI_Model {
public function getCourse() public function getCourse()
{ {
$this->db->select('CU.CourseID,CU.CourseName,CU.FeesType,CU.Specilization1,CU.Specilization2,CU.PC,CU.DC,CU.TC,CU.MC,CU.OtherFees,CU.IsActive,US.UniversityID,US.UniversityName'); $this->db->select('CU.CourseID,CU.CourseCode,CU.CourseName,CU.FeesType,CU.Specilization1,CU.Specilization2,CU.PC,CU.DC,CU.TC,CU.MC,CU.OtherFees,CU.IsActive,US.UniversityID,US.UniversityName');
$this->db->from(COURSE.' as CU'); $this->db->from(COURSE.' as CU');
$this->db->join(UNIVERSITY.' as US', 'US.UniversityID = CU.UniversityID'); $this->db->join(UNIVERSITY.' as US', 'US.UniversityID = CU.UniversityID');
$this->db->order_by('CU.CreatedOn','DESC'); $this->db->order_by('CU.CreatedOn','DESC');
@ -81,6 +81,7 @@ class Course_model extends CI_Model {
foreach ($courseDetails->result() as $row){ foreach ($courseDetails->result() as $row){
$fetchData['CourseID']=$row->CourseID; $fetchData['CourseID']=$row->CourseID;
$fetchData['CourseCode']=$row->CourseCode;
$fetchData['CourseName']=$row->CourseName; $fetchData['CourseName']=$row->CourseName;
$fetchData['FeesType']=$row->FeesType; $fetchData['FeesType']=$row->FeesType;
$fetchData['Specilization1']=$row->Specilization1; $fetchData['Specilization1']=$row->Specilization1;
@ -123,42 +124,52 @@ class Course_model extends CI_Model {
* */ * */
public function updateCourse($arrayDetails=null,$jsonData=null) public function updateCourse($arrayDetails=null,$jsonData=null)
{ {
$this->db->where('CourseID',$arrayDetails['CourseID']); $this->db->select('CourseCode');
$upateStatus=$this->db->update(COURSE, $arrayDetails); $this->db->where('CourseCode', $arrayDetails['CourseCode']);
if($upateStatus) { $this->db->where('CourseID !=', $arrayDetails['CourseID']);
if($this->db->get(COURSE)->first_row()){
$result['courseStatus'] = false;
$result['message'] = "This course id is already exist!";
}
else{
$this->db->where('CourseID',$arrayDetails['CourseID']);
$upateStatus=$this->db->update(COURSE, $arrayDetails);
if($upateStatus) {
if ($jsonData) { if ($jsonData) {
foreach ($jsonData as $row) { foreach ($jsonData as $row) {
$feesID = $row['ID']; $feesID = $row['ID'];
$updateFeesArray['CourseID'] = $arrayDetails['CourseID']; $updateFeesArray['CourseID'] = $arrayDetails['CourseID'];
$updateFeesArray['FeesAmount'] = $row['FeesAmount']; $updateFeesArray['FeesAmount'] = $row['FeesAmount'];
$updateFeesArray['Sem_Year'] = $row['programName']; $updateFeesArray['Sem_Year'] = $row['programName'];
$updateFeesArray['UpdatedOn'] = $arrayDetails['UpdatedOn']; $updateFeesArray['UpdatedOn'] = $arrayDetails['UpdatedOn'];
$updateFeesArray['UpdatedBy'] = $arrayDetails['UpdatedBy']; $updateFeesArray['UpdatedBy'] = $arrayDetails['UpdatedBy'];
$updateFeesArray['ProgramType'] =$row['program'];
$updateFeesArray['FeesType'] =$row['FeesType'];
if($feesID!='' OR $feesID!=null){
$this->db->where('ID', $feesID);
$this->db->update(COURSE_FEES, $updateFeesArray);
}
else{
$this->db->insert(COURSE_FEES, $updateFeesArray);
}
$updateFeesArray['ProgramType'] =$row['program'];
$updateFeesArray['FeesType'] =$row['FeesType'];
if($feesID!='' OR $feesID!=null){
$this->db->where('ID', $feesID);
$this->db->update(COURSE_FEES, $updateFeesArray);
}
else{
$this->db->insert(COURSE_FEES, $updateFeesArray);
} }
$result['courseStatus'] = true;
$result['message'] = "Successfully course details updated";
} }
}
else {
$result['courseStatus'] = false;
$result['message'] = "Something went wrong.please try again";
$result['courseStatus'] = true;
$result['message'] = "Successfully course details updated";
} }
} }
else {
$result['courseStatus'] = false;
$result['message'] = "Something went wrong.please try again";
}
return $result; return $result;

3
Apollo/assets/css/styles.css
View File

@ -2506,6 +2506,9 @@ ul.sub-menu li ul.sub-menu li ul.sub-menu li a {
.height-350 { .height-350 {
height: 350px !important; height: 350px !important;
} }
.height-460 {
height: 460px !important;
}
.width-200 { .width-200 {
width: 200px !important; width: 200px !important;

52
Apollo/assets/i18n/en.json
View File

@ -1,7 +1,7 @@
{ {
"dashboard": { "dashboard": {
"WELCOME": "Welcome to {{appName}}" "WELCOME": "Welcome to {{appName}}"
}, },
"topbar": { "topbar": {
"messages": { "messages": {
"MAIN": "Messages", "MAIN": "Messages",
@ -57,28 +57,28 @@
"MAIN": "Dashboard" "MAIN": "Dashboard"
}, },
"master": { "master": {
"MAIN": "MASTER DETAILS", "MAIN": "SETTINGS",
"BRANCH": "BRANCH DETAILS", "BRANCH": "BRANCH ",
"STAFF": "STAFF DETAILS", "STAFF": "STAFF ",
"BATCH": "BATCH DETAILS", "BATCH": "BATCH ",
"UNIVERSITY": "UNIVERSITY DETAILS", "UNIVERSITY": "UNIVERSITY",
"COURSE": "COURSE DETAILS", "COURSE": "COURSE ",
"ACTIVITY": "ACTIVITY DETAILS", "ACTIVITY": "ACTIVITY",
"EMPLOYEE": "EMPLOYEE DETAILS", "EMPLOYEE": "EMPLOYEE",
"ANNOUNCEMENT": "ANNOUNCEMENT DETAILS", "ANNOUNCEMENT": "ANNOUNCEMENT",
"STATUS": "STATUS DETAILS", "STATUS": "STATUS",
"STUDENTSTATUS": "STUDENT ACTIVITY STATUS", "STUDENTSTATUS": "ACTIVITY STATUS",
"CERTIFICATETYPE": "CERTIFICATE TYPE", "CERTIFICATETYPE": "CERTIFICATE TYPE",
"DAYBOOKMASTER":"DAY BOOK DETAILS" "DAYBOOKMASTER":"EXPENSE HEADS"
}, },
"student": { "student": {
"MAIN": "MANAGE STUDENTS", "MAIN": "STUDENTS",
"LISTING": "STUDENTS LISTING", "LISTING": "STUDENTS LISTING",
"ENROLLMENT": "STUDENT ENROLLMENT", "ENROLLMENT": "STUDENT ENROLLMENT",
"STUDENTDETAILS": "STUDENT DETAILS", "STUDENTDETAILS": "STUDENT DETAILS",
"STUDENTDETAILSADDEDIT": "ADD/EDIT STUDENT DETAILS", "STUDENTDETAILSADDEDIT": "MANAGE DETAILS",
"status" : { "status" : {
"MAIN": "STATUS UPDATE", "MAIN": "UPDATE STATUS ",
"STUDYMATERIAL": "STUDY MATERIAL", "STUDYMATERIAL": "STUDY MATERIAL",
"ANSWERBOOKLET": "ANSWER BOOKLET", "ANSWERBOOKLET": "ANSWER BOOKLET",
"CERTIFICATION": "MARK CARD", "CERTIFICATION": "MARK CARD",
@ -88,7 +88,7 @@
"status": { "status": {
"MAIN": "STATUS", "MAIN": "STATUS",
"APPLICATION": "APPLICATION STATUS", "APPLICATION": "APPLICATION STATUS",
"FEES": "FEES STATUS", "FEES": "FEES ",
"STUDENTFEES":"FEES DETAILS", "STUDENTFEES":"FEES DETAILS",
"CERTIFICATE": "CERTIFICATE STATUS", "CERTIFICATE": "CERTIFICATE STATUS",
"ANSWERBOOKLET": "ANSWER BOOKLET STATUS", "ANSWERBOOKLET": "ANSWER BOOKLET STATUS",
@ -103,17 +103,17 @@
}, },
"tracking": { "tracking": {
"MAIN": "CALL TRACKING", "MAIN": "CALL TRACKING",
"details":"ADD/VIEW DETAILS", "details":"ADD/VIEW LEADS",
"close":"CLOSE DETAILS", "close":"CLOSED LEADS",
"pending":"PENDING DETAILS", "pending":"PENDING LEADS",
"lead":"LEAD DETAILS" "lead":"DAY WISE LEADS"
}, },
"daybook": { "daybook": {
"MAIN": "DAY BOOK", "MAIN": "INCOME / EXPENSE",
"INCOMELISTING": "INCOME LISTING", "INCOMELISTING": "INCOME LISTING",
"EXPENSELISTING": "EXPENSE LISTING", "EXPENSELISTING": "EXPENSE LISTING",
"DAYBOOK": "DAY BOOK ", "DAYBOOK": "DAY BOOK ",
"APPROVAL": "DAY BOOK APPROVAL" "APPROVAL": "APPROVE EXPENSE"
}, },
"mydetails": { "mydetails": {
"MAIN": "MY DETAILS" "MAIN": "MY DETAILS"
@ -127,9 +127,9 @@
"MAIN": "MY PROFILE" "MAIN": "MY PROFILE"
}, },
"sendSMSPage": { "sendSMSPage": {
"MAIN": "BROADCAST", "MAIN": "BROADCAST SMS",
"SENDSMS": "SMS SENT", "SENDSMS": "SEND MESSAGE",
"SENDSMSDETAILS": "SENT SMS DETAILS" "SENDSMSDETAILS": "SENT MESSAGE"
} }
} }
}, },

57
Apollo/assets/js/config.router.js
View File

@ -14,8 +14,7 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
app.constant = $provide.constant; app.constant = $provide.constant;
app.value = $provide.value; app.value = $provide.value;
// LAZY MODULES // LAZY MODULES
$ocLazyLoadProvider.config({ $ocLazyLoadProvider.config({
@ -98,9 +97,9 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
}).state('app.master', { }).state('app.master', {
url: '/master', url: '/master',
template: '<div ui-view class="fade-in-up"></div>', template: '<div ui-view class="fade-in-up"></div>',
title: 'Master Details', title: 'Settings',
ncyBreadcrumb: { ncyBreadcrumb: {
label: 'Master Details' label: 'Settings'
} }
}).state('app.master.branch', { }).state('app.master.branch', {
url: '/branch', url: '/branch',
@ -167,9 +166,9 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
url: '/default activity', url: '/default activity',
templateUrl: "assets/views/studentStatusUpdate.html", templateUrl: "assets/views/studentStatusUpdate.html",
resolve: loadSequence('ui.select','studentStatusUpdateCtrl','ngTable', 'ladda', 'angular-ladda'), resolve: loadSequence('ui.select','studentStatusUpdateCtrl','ngTable', 'ladda', 'angular-ladda'),
title: 'Status', title: 'Activity Status',
ncyBreadcrumb: { ncyBreadcrumb: {
label: 'Status' label: 'Activity Status'
}, },
}).state('app.master.dayBookMaster', { }).state('app.master.dayBookMaster', {
url: '/day book master', url: '/day book master',
@ -192,7 +191,7 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
url: '/activity', url: '/activity',
templateUrl: "assets/views/activity.html", templateUrl: "assets/views/activity.html",
resolve: loadSequence('ui.select','activityCtrl','ngTable', 'ladda', 'angular-ladda'), resolve: loadSequence('ui.select','activityCtrl','ngTable', 'ladda', 'angular-ladda'),
title: 'Activity', title: 'Add/Edit Activity List',
ncyBreadcrumb: { ncyBreadcrumb: {
label: 'Activity' label: 'Activity'
}, },
@ -231,9 +230,9 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
url: '/studentDetailsAddEdit', url: '/studentDetailsAddEdit',
templateUrl: "assets/views/student/student_details_SuperAdmin.html", templateUrl: "assets/views/student/student_details_SuperAdmin.html",
resolve: loadSequence('ui.select','spin', 'ui.mask', 'ladda', 'angular-ladda', 'studentCtrl', 'ngTable'), resolve: loadSequence('ui.select','spin', 'ui.mask', 'ladda', 'angular-ladda', 'studentCtrl', 'ngTable'),
title: 'Add/Edit Student Details', title: 'Manage Details',
ncyBreadcrumb: { ncyBreadcrumb: {
label: 'Add/Edit Student Details' label: 'Manage Details'
} }
}).state('app.student.status', { }).state('app.student.status', {
url: '/status', url: '/status',
@ -315,17 +314,17 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
}).state('app.call', { }).state('app.call', {
url: '/call', url: '/call',
template: '<div ui-view class="fade-in-up"></div>', template: '<div ui-view class="fade-in-up"></div>',
title: 'call tracking', title: 'Call tracking',
ncyBreadcrumb: { ncyBreadcrumb: {
label: 'tracking' label: 'Call Tracking'
} }
}).state('app.call.tracking', { }).state('app.call.tracking', {
url: '/tracking', url: '/tracking',
templateUrl: "assets/views/callTrackingDetails.html", templateUrl: "assets/views/callTrackingDetails.html",
title: 'tracking', title: 'Add/View leads',
resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'callTrackingCtrl','ngTable'), resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'callTrackingCtrl','ngTable'),
ncyBreadcrumb: { ncyBreadcrumb: {
label: 'details' label: 'Add/View leads'
} }
}).state('app.call.trackingFollowup', { }).state('app.call.trackingFollowup', {
url: '/tracking_followup', url: '/tracking_followup',
@ -339,65 +338,65 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
}).state('app.call.lead', { }).state('app.call.lead', {
url: '/lead', url: '/lead',
templateUrl: "assets/views/callTrackingLeadDetails.html", templateUrl: "assets/views/callTrackingLeadDetails.html",
title: 'lead', title: 'Day wise leads',
resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'callTrackingCtrl','ngTable'), resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'callTrackingCtrl','ngTable'),
ncyBreadcrumb: { ncyBreadcrumb: {
label: 'lead' label: 'Day wise leads'
} }
}).state('app.call.close', { }).state('app.call.close', {
url: '/close', url: '/close',
templateUrl: "assets/views/callTrackingCloseDetails.html", templateUrl: "assets/views/callTrackingCloseDetails.html",
title: 'close', title: 'Closed leads',
resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'callTrackingCtrl','ngTable'), resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'callTrackingCtrl','ngTable'),
ncyBreadcrumb: { ncyBreadcrumb: {
label: 'close' label: 'Closed leads'
} }
}).state('app.call.pending', { }).state('app.call.pending', {
url: '/pending', url: '/pending',
templateUrl: "assets/views/callTrackingPendingDetails.html", templateUrl: "assets/views/callTrackingPendingDetails.html",
title: 'pending', title: 'Pending leads',
resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'callTrackingCtrl','ngTable'), resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'callTrackingCtrl','ngTable'),
ncyBreadcrumb: { ncyBreadcrumb: {
label: 'pending' label: 'Pending leads'
} }
}).state('app.daybook', { }).state('app.daybook', {
url: '/daybook', url: '/daybook',
template: '<div ui-view class="fade-in-up"> <div style="margin: auto; width: 50%;padding: 10px;"> STUDENT STATUS UPDATE </div> </div>', template: '<div ui-view class="fade-in-up"> <div style="margin: auto; width: 50%;padding: 10px;"> STUDENT STATUS UPDATE </div> </div>',
title: 'daybook', title: 'Income/Expense',
ncyBreadcrumb: { ncyBreadcrumb: {
label: 'daybook' label: 'Income/Expense'
} }
}).state('app.daybook.details', { }).state('app.daybook.details', {
url: '/daybookdetails', url: '/daybookdetails',
templateUrl: "assets/views/daybook/daybook.html", templateUrl: "assets/views/daybook/daybook.html",
title: 'daybookdetails', title: 'Income/Expense',
resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'daybookCtrl','ngTable'), resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'daybookCtrl','ngTable'),
ncyBreadcrumb: { ncyBreadcrumb: {
label: 'daybookdetails' label: 'Income/Expense'
} }
}).state('app.daybook.approval', { }).state('app.daybook.approval', {
url: '/daybookApproval', url: '/daybookApproval',
templateUrl: "assets/views/daybook/dayBookApproval.html", templateUrl: "assets/views/daybook/dayBookApproval.html",
title: 'Day Book Approval', title: 'Approve expense',
resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'daybookapprovalCtrl','ngTable'), resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'daybookapprovalCtrl','ngTable'),
ncyBreadcrumb: { ncyBreadcrumb: {
label: 'daybookApproval' label: 'Approve expense'
} }
}).state('app.daybookadmin', { }).state('app.daybookadmin', {
url: '/daybookadmin', url: '/daybookadmin',
templateUrl: "assets/views/daybook/daybookadmin.html", templateUrl: "assets/views/daybook/daybookadmin.html",
title: 'daybook', title: 'Income/Expense',
resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'daybookadminCtrl','ngTable'), resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'daybookadminCtrl','ngTable'),
ncyBreadcrumb: { ncyBreadcrumb: {
label: 'daybook' label: 'Income/Expense'
} }
}).state('app.daybooksuperadmin', { }).state('app.daybooksuperadmin', {
url: '/daybooksuperadmin', url: '/daybooksuperadmin',
templateUrl: "assets/views/daybook/daybooksuperadmin.html", templateUrl: "assets/views/daybook/daybooksuperadmin.html",
title: 'daybook', title: 'Income/Expense',
resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'daybooksuperadminCtrl','ngTable'), resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'daybooksuperadminCtrl','ngTable'),
ncyBreadcrumb: { ncyBreadcrumb: {
label: 'daybook' label: 'Income/Expense'
} }
}).state('app.broadCast', { }).state('app.broadCast', {
url: '/broadcast', url: '/broadcast',

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

@ -99,11 +99,11 @@ if(myModel.status.length > 0) {
if (response.data.status == 200 && response.data.activityStatus) { if (response.data.status == 200 && response.data.activityStatus) {
$scope.ldloading[loading.replace('-', '_')] = false; $scope.ldloading[loading.replace('-', '_')] = false;
$scope.init(); $scope.init();
swal("Success!", response.data.message, "success"); swal("","Activity details added successfully.", "success");
$state.go($state.current, {}, { reload: true }); $state.go($state.current, {}, { reload: true });
} else { } else {
$scope.ldloading[loading.replace('-', '_')] = false; $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) { if (response.data.status==200 && response.data.activityStatus) {
$scope.ldloading3[loading.replace('-', '_')] = false; $scope.ldloading3[loading.replace('-', '_')] = false;
swal("Success!", response.data.message, "success"); swal(" "," Updated Successfully", "success");
$scope.init(); $scope.init();
$scope.editId = -1; $scope.editId = -1;
} else { } else {
$scope.ldloading3[loading.replace('-', '_')] = false; $scope.ldloading3[loading.replace('-', '_')] = false;
swal("Failed!", response.data.message, "error"); swal(" ","Something went wrong.please try again", "error");
} }
}); });
} }

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

@ -55,10 +55,7 @@ app.controller("CkeditorCtrl", ["$scope", "toaster", "$filter", "ngTableParams",
// $scope.submitForm = function() { // $scope.submitForm = function() {
// alert(JSON.stringify($scope.myModel.description)); // alert(JSON.stringify($scope.myModel.description));
// } // }
$scope.announcementForm = { $scope.announcementForm = {
submit: function (form, myModel, loading) { submit: function (form, myModel, loading) {
@ -101,11 +98,11 @@ app.controller("CkeditorCtrl", ["$scope", "toaster", "$filter", "ngTableParams",
$http(addAnnouncement).then(function (response) { $http(addAnnouncement).then(function (response) {
if (response.data.status == 200 && response.data.AnnouncementStatus) { if (response.data.status == 200 && response.data.AnnouncementStatus) {
$scope.ldloading1[loading.replace('-', '_')] = false; $scope.ldloading1[loading.replace('-', '_')] = false;
swal("Success!", response.data.message, "success"); swal("", "Announcement added successfully.", "success");
$state.go($state.current, {}, { reload: true }); $state.go($state.current, {}, { reload: true });
} else { } else {
$scope.ldloading1[loading.replace('-', '_')] = false; $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) { if (response.data.status == 200 && response.data.AnnouncementStatus) {
$scope.ldloading[loading.replace('-', '_')] = false; $scope.ldloading[loading.replace('-', '_')] = false;
swal("Success!", response.data.message, "success"); swal("","Updated successfully." , "success");
$scope.editId = -1; $scope.editId = -1;
$scope.init(); $scope.init();
} else { } else {
$scope.ldloading[loading.replace('-', '_')] = false; $scope.ldloading[loading.replace('-', '_')] = false;
swal("Failed!", response.data.message, "error"); swal(" ", response.data.message, "error");
} }
}); });
} }

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

@ -332,14 +332,14 @@ app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
}; };
$http(updateStudyMaterial).then(function (response) { $http(updateStudyMaterial).then(function (response) {
if (response.data.addStatus) { if (response.data.addStatus) {
swal("Success!", response.data.message, "success"); swal(" ", "Updated successfully.", "success");
$scope.disableButton = false; $scope.disableButton = false;
angular.forEach($scope.searchResultDetails, function (item) { angular.forEach($scope.searchResultDetails, function (item) {
item.Selected = false; item.Selected = false;
}); });
$scope.OpenWindowStatus = false; $scope.OpenWindowStatus = false;
} else { } else {
swal("Failed!", response.data.message, "error"); swal(" ", response.data.message, "error");
$scope.disableButton = false; $scope.disableButton = false;
} }
}); });

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

@ -366,7 +366,7 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
}; };
$http(updateStudyMaterial).then(function (response) { $http(updateStudyMaterial).then(function (response) {
if (response.data.addStatus) { if (response.data.addStatus) {
swal("Success!", response.data.message, "success"); swal(" ","Updated successfully.", "success");
$scope.disableButton = false; $scope.disableButton = false;
// for success state // for success state
angular.forEach($scope.searchResultDetails, function (item) { angular.forEach($scope.searchResultDetails, function (item) {
@ -375,7 +375,7 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
// $scope.OpenWindowStatus = false; // $scope.OpenWindowStatus = false;
$scope.OpenWindowStatus = false; $scope.OpenWindowStatus = false;
} else { } else {
swal("Failed!", response.data.message, "error"); swal(" ", response.data.message, "error");
$scope.disableButton = false; $scope.disableButton = false;
// for success state // for success state
angular.forEach($scope.searchResultDetails, function (item) { angular.forEach($scope.searchResultDetails, function (item) {

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

@ -87,11 +87,11 @@ app.controller('batchCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTabl
$http(addBatch).then(function (response) { $http(addBatch).then(function (response) {
if (response.data.status==200 && response.data.batchStatus) { if (response.data.status==200 && response.data.batchStatus) {
$scope.ldloading1[loading.replace('-', '_')] = false; $scope.ldloading1[loading.replace('-', '_')] = false;
swal("Success!", response.data.message, "success"); swal("", "Batch added successfully.", "success");
$state.go($state.current, {}, {reload: true}); $state.go($state.current, {}, {reload: true});
} else { } else {
$scope.ldloading1[loading.replace('-', '_')] = false; $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.ldloading[loading.replace('-', '_')] = false;
$scope.editId = -1; $scope.editId = -1;
$scope.init(); $scope.init();
swal("Success!", response.data.message, "success"); swal("", "Updated Successfully.", "success");
} else { } else {
$scope.ldloading[loading.replace('-', '_')] = false; $scope.ldloading[loading.replace('-', '_')] = false;
swal("Failed!", response.data.message, "error"); swal("", response.data.message, "error");
} }
}); });
} }

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

@ -144,11 +144,11 @@ app.controller('branchCtrl', ["$scope","toaster", "$filter", "ngTableParams", "A
}).success(function (data) { }).success(function (data) {
if (data.status==200 && data.branchStatus) { if (data.status==200 && data.branchStatus) {
$scope.ldloading1[loading.replace('-', '_')] = false; $scope.ldloading1[loading.replace('-', '_')] = false;
swal("Success!", data.message, "success"); swal("", "Branch added successfully.", "success");
$state.go($state.current, {}, {reload: true}); $state.go($state.current, {}, {reload: true});
} else { } else {
$scope.ldloading1[loading.replace('-', '_')] = false; $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) { }).success(function (data) {
if (data.status==200 && data.branchStatus) { if (data.status==200 && data.branchStatus) {
$scope.ldloading[loading.replace('-', '_')] = false; $scope.ldloading[loading.replace('-', '_')] = false;
swal("Success!", data.message, "success"); swal("", "Updated Successfully.", "success");
$scope.editId = -1; $scope.editId = -1;
$scope.init(); $scope.init();
} else { } else {
$scope.ldloading1[loading.replace('-', '_')] = false; $scope.ldloading1[loading.replace('-', '_')] = false;
swal("Failed!", data.message, "error"); swal("", data.message, "error");
} }
}); });

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

@ -306,11 +306,11 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter",
$http(addLead).then(function (response) { $http(addLead).then(function (response) {
if (response.data.status==200 && response.data.leadStatus) { if (response.data.status==200 && response.data.leadStatus) {
$scope.ldloading1[loading.replace('-', '_')] = false; $scope.ldloading1[loading.replace('-', '_')] = false;
swal("Success!", response.data.message, "success"); swal(" ", "Lead tracking added successfully.", "success");
$state.go($state.current, {}, {reload: true}); $state.go($state.current, {}, {reload: true});
} else { } else {
$scope.ldloading1[loading.replace('-', '_')] = false; $scope.ldloading1[loading.replace('-', '_')] = false;
swal("Failed!", response.data.message, "error"); swal(" ", response.data.message, "error");
} }
}); });

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

@ -81,11 +81,11 @@ $scope.certificateForm = {
if (response.data.status == 200 && response.data.certificateStatus) { if (response.data.status == 200 && response.data.certificateStatus) {
$scope.ldloading1[loading.replace('-', '_')] = false; $scope.ldloading1[loading.replace('-', '_')] = false;
$scope.init(); $scope.init();
swal("Success!", response.data.message, "success"); swal(" ","Certificate added successfully.", "success");
$state.go($state.current, {}, { reload: true }); $state.go($state.current, {}, { reload: true });
} else { } else {
$scope.ldloading1[loading.replace('-', '_')] = false; $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) { $http(update).then(function (response) {
if (response.data.status==200 && response.data.certificateStatus) { if (response.data.status==200 && response.data.certificateStatus) {
$scope.ldloading[loading.replace('-', '_')] = false; $scope.ldloading[loading.replace('-', '_')] = false;
swal("Success!", response.data.message, "success"); swal(" ","Updated successfully." , "success");
$scope.editId = -1; $scope.editId = -1;
$scope.init(); $scope.init();
} else { } else {
$scope.ldloading[loading.replace('-', '_')] = false; $scope.ldloading[loading.replace('-', '_')] = false;
swal("Failed!", response.data.message, "error"); swal(" ", response.data.message, "error");
} }
}); });

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

@ -368,7 +368,7 @@ app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
}; };
$http(updateCertificateStatus).then(function (response) { $http(updateCertificateStatus).then(function (response) {
if (response.data.addStatus) { if (response.data.addStatus) {
swal("Success!", response.data.message, "success"); swal(" ", "Updated Successfully.", "success");
$scope.disableButton = false; $scope.disableButton = false;
// for success state // for success state
// $scope.allSelected('undefined'); // $scope.allSelected('undefined');
@ -377,7 +377,7 @@ app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
}); });
$scope.OpenWindowStatus = false; $scope.OpenWindowStatus = false;
} else { } else {
swal("Failed!", response.data.message, "error"); swal(" ", response.data.message, "error");
$scope.disableButton = false; $scope.disableButton = false;
} }
}); });

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

@ -51,7 +51,7 @@ app.controller('changePasswordCtrl', ["$scope", "$filter", "ngTableParams", "API
if (response.data.changePassStatus == true) { if (response.data.changePassStatus == true) {
// SweetAlert.swal("Hello!", "Password changed Succesfully"); // SweetAlert.swal("Hello!", "Password changed Succesfully");
// $state.go($state.current, {}, { reload: true }); // $state.go($state.current, {}, { reload: true });
swal("Success!", response.data.message, "success"); swal(" ", "Password Changed successfully.", "success");
form.$setPristine(true); form.$setPristine(true);
$scope.myModel = { $scope.myModel = {
curr: "", curr: "",
@ -59,7 +59,7 @@ app.controller('changePasswordCtrl', ["$scope", "$filter", "ngTableParams", "API
password2: "" password2: ""
}; };
} else { } else {
swal("Warning!", response.data.message, "warning"); swal(" ", response.data.message, "warning");
// $state.go($state.current, {}, { reload: true }); // $state.go($state.current, {}, { reload: true });
} }
}, function (error) { }, function (error) {

13
Apollo/assets/js/controllers/courseCtrl.js
View File

@ -158,7 +158,7 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
'Content-Type': 'application/json' 'Content-Type': 'application/json'
}, },
data: { data: {
courseID: myModel.courseCode, courseCode: myModel.courseCode,
courseName: myModel.courseName, courseName: myModel.courseName,
universityName: myModel.universityName, universityName: myModel.universityName,
feesType:myModel.ListName.ListCode, feesType:myModel.ListName.ListCode,
@ -179,12 +179,12 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
$http(addCourse).then(function (response) { $http(addCourse).then(function (response) {
if (response.data.status==200 && response.data.courseStatus) { if (response.data.status==200 && response.data.courseStatus) {
$scope.ldloading1[loading.replace('-', '_')] = false; $scope.ldloading1[loading.replace('-', '_')] = false;
swal("Success!", response.data.message, "success"); swal(" ", "COurse added successfully.", "success");
$state.go($state.current, {}, {reload: true}); $state.go($state.current, {}, {reload: true});
} else { } else {
$scope.addMoreItems.splice($scope.addMoreItems.length-1); $scope.addMoreItems.splice($scope.addMoreItems.length-1);
$scope.ldloading1[loading.replace('-', '_')] = false; $scope.ldloading1[loading.replace('-', '_')] = false;
swal("Failed!", response.data.message, "error"); swal(" ", response.data.message, "error");
} }
}); });
} }
@ -245,7 +245,8 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
'Content-Type': 'application/json' 'Content-Type': 'application/json'
}, },
data: { data: {
courseCode: myModel.CourseID, courseID: myModel.CourseID,
courseCode: myModel.CourseCode,
courseName: myModel.CourseName, courseName: myModel.CourseName,
provFess:myModel.PC, provFess:myModel.PC,
transferAmount:myModel.TC, transferAmount:myModel.TC,
@ -268,7 +269,7 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
$scope.ldloading[loading.replace('-', '_')] = false; $scope.ldloading[loading.replace('-', '_')] = false;
$rootScope.updateMoreItems=[]; $rootScope.updateMoreItems=[];
$rootScope.init(); $rootScope.init();
swal("Success!", response.data.message, "success"); swal(" ", "Updated successfully.", "success");
$scope.editId = -1; $scope.editId = -1;
@ -276,7 +277,7 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
} else { } else {
$scope.ldloading[loading.replace('-', '_')] = false; $scope.ldloading[loading.replace('-', '_')] = false;
// $rootScope.init(); // $rootScope.init();
swal("Failed!", response.data.message, "error"); swal(" ", response.data.message, "error");
} }
}); });
} }

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

@ -83,11 +83,11 @@ app.controller("dayBookMasterCtrl", ["$scope", "toaster", "$filter", "API_POINTS
if (response.data.status == 200 && response.data.addStatus) { if (response.data.status == 200 && response.data.addStatus) {
$scope.ldloading1[loading.replace('-', '_')] = false; $scope.ldloading1[loading.replace('-', '_')] = false;
$scope.init(); $scope.init();
swal("Success!", response.data.message, "success"); swal(" ", "Income/Expense added successfullly.", "success");
$state.go($state.current, {}, { reload: true }); $state.go($state.current, {}, { reload: true });
} else { } else {
$scope.ldloading1[loading.replace('-', '_')] = false; $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) { $http(update).then(function (response) {
if (response.data.status==200 && response.data.updateStatus) { if (response.data.status==200 && response.data.updateStatus) {
$scope.ldloading[loading.replace('-', '_')] = false; $scope.ldloading[loading.replace('-', '_')] = false;
swal("Success!", response.data.message, "success"); swal( "", "Updated successfully.", "success");
$scope.editId = -1; $scope.editId = -1;
$scope.init(); $scope.init();
} else { } else {
$scope.ldloading[loading.replace('-', '_')] = false; $scope.ldloading[loading.replace('-', '_')] = false;
swal("Failed!", response.data.message, "error"); swal(" ", response.data.message, "error");
} }
}); });

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

@ -243,10 +243,10 @@ $scope.dayBookApprovalAccess = '';
}; };
$http(deleteDetails).then(function (response) { $http(deleteDetails).then(function (response) {
if (response.data.deletedStatus) { if (response.data.deletedStatus) {
swal("Success!", response.data.message, "success"); swal(" ", "Deleted Successfully.", "success");
$scope.getDayBookList(); $scope.getDayBookList();
} else { } else {
swal("Failed!", response.data.message, "error"); swal(" ", response.data.message, "error");
} }
}); });
} }
@ -302,10 +302,10 @@ $scope.dayBookApprovalAccess = '';
}; };
$http(addDayBookDetails).then(function (response) { $http(addDayBookDetails).then(function (response) {
if (response.data.addDayBookStatus) { if (response.data.addDayBookStatus) {
swal("Success!", response.data.message, "success"); swal(" ", "Income/Expense added successfully.", "success");
$state.go($state.current, {}, { reload: true }); $state.go($state.current, {}, { reload: true });
} else { } else {
swal("Failed!", response.data.message, "error"); swal(" ", response.data.message, "error");
} }
}); });
} }
@ -359,12 +359,12 @@ $scope.dayBookApprovalAccess = '';
}; };
$http(updateDayBookDetails).then(function (response) { $http(updateDayBookDetails).then(function (response) {
if (response.data.updateDetailsStatus) { if (response.data.updateDetailsStatus) {
swal("Success!", response.data.message, "success"); swal(" ","Updated successfully.", "success");
// for success state // for success state
$scope.editId = -1; $scope.editId = -1;
$scope.getDayBookList(); $scope.getDayBookList();
} else { } else {
swal("Failed!", response.data.message, "error"); swal(" ", response.data.message, "error");
} }
}); });
} }

8
Apollo/assets/js/controllers/daybookadminCtrl.js
View File

@ -290,17 +290,17 @@ app.controller('daybookadminCtrl', ["$scope", "$rootScope", "toaster", "$filter"
}; };
$http(updateStudyMaterial).then(function (response) { $http(updateStudyMaterial).then(function (response) {
if (response.data.addStatus) { if (response.data.addStatus) {
swal("Success!", response.data.message, "success"); swal(" ", "Updated successfully.", "success");
// for success state // for success state
$scope.getDayBookList(); $scope.getDayBookList();
$scope.allSelected('undefined'); $scope.allSelected('undefined');
$scope.OpenWindowStatus = false; $scope.OpenWindowStatus = false;
} else { } else {
swal("Failed!", response.data.message, "error"); swal(" ", response.data.message, "error");
} }
}); });
} else { } 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) { let ans = $scope.data.some(function (val, i) {
if (val.id === id) { if (val.id === id) {
$scope.data.splice(i, 1); $scope.data.splice(i, 1);
swal("Deleted!", "Your record has been deleted.", "success"); swal(" ", "Your record has been deleted.", "success");
return true; return true;
} }
}); return ans; }); return ans;

6
Apollo/assets/js/controllers/daybookapprovalCtrl.js
View File

@ -290,17 +290,17 @@ app.controller('daybookapprovalCtrl', ["$scope", "$rootScope", "toaster", "$filt
}; };
$http(updateStudyMaterial).then(function (response) { $http(updateStudyMaterial).then(function (response) {
if (response.data.addStatus) { if (response.data.addStatus) {
swal("Success!", response.data.message, "success"); swal(" ", "Updated successfully,", "success");
// for success state // for success state
$scope.getDayBookList(); $scope.getDayBookList();
$scope.allSelected('undefined'); $scope.allSelected('undefined');
$scope.OpenWindowStatus = false; $scope.OpenWindowStatus = false;
} else { } else {
swal("Failed!", response.data.message, "error"); swal(" ", response.data.message, "error");
} }
}); });
} else { } else {
swal("Warning!", "Item not Selected", "warning"); swal(" ", "Item not Selected", "warning");
} }
} }

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

@ -248,13 +248,13 @@ app.controller('daybooksuperadminCtrl', ["$scope", "$rootScope", "toaster", "$fi
}; };
$http(updateStudyMaterial).then(function (response) { $http(updateStudyMaterial).then(function (response) {
if (response.data.addStatus) { if (response.data.addStatus) {
swal("Success!", response.data.message, "success"); swal(" ", "Updated successfully.", "success");
// for success state // for success state
$scope.getDayBookList(); $scope.getDayBookList();
$scope.allSelected('undefined'); $scope.allSelected('undefined');
$scope.OpenWindowStatus = false; $scope.OpenWindowStatus = false;
} else { } else {
swal("Failed!", response.data.message, "error"); swal(" ", response.data.message, "error");
} }
}); });
} }

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

@ -271,7 +271,7 @@ app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$
}; };
$http(checkReq).then(function (response) { $http(checkReq).then(function (response) {
if (response.data.existEmpId == true) { if (response.data.existEmpId == true) {
swal("Warning!", response.data.message, "warning"); swal("", response.data.message, "warning");
$scope.myModel.employeeId = ''; $scope.myModel.employeeId = '';
} else { } else {
} }
@ -293,7 +293,7 @@ app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$
}; };
$http(checkReq).then(function (response) { $http(checkReq).then(function (response) {
if (response.data.existMobile == true) { if (response.data.existMobile == true) {
swal("Warning!", response.data.message, "warning"); swal("", response.data.message, "warning");
$scope.myModel.primaryPhone = ''; $scope.myModel.primaryPhone = '';
} else { } else {
} }
@ -315,7 +315,7 @@ app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$
}; };
$http(checkReq).then(function (response) { $http(checkReq).then(function (response) {
if (response.data.existEmailId == true) { if (response.data.existEmailId == true) {
swal("Warning!", response.data.message, "warning"); swal("", response.data.message, "warning");
$scope.myModel.emailId = ''; $scope.myModel.emailId = '';
} else { } else {
} }
@ -434,7 +434,7 @@ app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$
}; };
$http(req).then(function (response) { $http(req).then(function (response) {
if (response.data.addEmpStatus == true) { if (response.data.addEmpStatus == true) {
swal("Success!", response.data.message, "success"); swal("Success!", "Employee details added successfully.", "success");
$state.go($state.current, {}, { reload: true }); $state.go($state.current, {}, { reload: true });
} else { } else {
// $scope.ldloading1[loading.replace('-', '_')] = false; // $scope.ldloading1[loading.replace('-', '_')] = false;
@ -494,7 +494,7 @@ app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$
}; };
$http(checkReq).then(function (response) { $http(checkReq).then(function (response) {
if (response.data.existMobile == true) { if (response.data.existMobile == true) {
swal("Warning!", response.data.message, "warning"); swal("", response.data.message, "warning");
p.MobileNumber = response.data.resetValue.MobileNumber; p.MobileNumber = response.data.resetValue.MobileNumber;
} else { } else {
} }
@ -516,7 +516,7 @@ app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$
}; };
$http(checkReq).then(function (response) { $http(checkReq).then(function (response) {
if (response.data.existEmailId == true) { if (response.data.existEmailId == true) {
swal("Warning!", response.data.message, "warning"); swal("", response.data.message, "warning");
p.EmailID = response.data.resetValue.EmailID; p.EmailID = response.data.resetValue.EmailID;
} else { } else {
} }
@ -569,12 +569,12 @@ app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$
}; };
$http(req).then(function (response) { $http(req).then(function (response) {
if (response.data.updateEmpStatus = true) { if (response.data.updateEmpStatus = true) {
swal("Success!", response.data.message, "success"); swal("", "Updated Successfully.", "success");
$scope.getEmployeeList(); $scope.getEmployeeList();
$scope.editId = -1; $scope.editId = -1;
} else { } else {
// $scope.ldloading1[loading.replace('-', '_')] = false; // $scope.ldloading1[loading.replace('-', '_')] = false;
swal("Failed!", response.data.message, "error"); swal("", response.data.message, "error");
} }
}); });
} else { } else {
@ -591,12 +591,12 @@ app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$
headers: { 'Content-Type': undefined, 'Process-Data': false }, headers: { 'Content-Type': undefined, 'Process-Data': false },
}).success(function (data) { }).success(function (data) {
if (data.updateEmpStatus == true) { if (data.updateEmpStatus == true) {
swal("Success!", data.message, "success"); swal("", "Updated Successfully.", "success");
$scope.getEmployeeList(); $scope.getEmployeeList();
$scope.editId = -1; $scope.editId = -1;
} else { } else {
// $scope.ldloading1[loading.replace('-', '_')] = false; // $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) { $http(req).then(function (response) {
if (response.data.updateEmpbranchStatus = true) { if (response.data.updateEmpbranchStatus = true) {
swal("Success!", response.data.message, "success"); swal("", "Updated Successfully.", "success");
$scope.getEmployeeList(); $scope.getEmployeeList();
$scope.editBranchId = -1; $scope.editBranchId = -1;
} else { } else {
// $scope.ldloading1[loading.replace('-', '_')] = false; // $scope.ldloading1[loading.replace('-', '_')] = false;
swal("Failed!", response.data.message, "error"); swal("", response.data.message, "error");
} }
}); });
} }

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

@ -248,7 +248,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
$http(updateFees).then(function (response) { $http(updateFees).then(function (response) {
if (response.data.status==200 && response.data.paidStatus) { if (response.data.status==200 && response.data.paidStatus) {
$scope.ldloading[loading.replace('-', '_')] = false; $scope.ldloading[loading.replace('-', '_')] = false;
swal("Success!", response.data.message, "success"); swal("Success!", "Updated successfully.", "success");
/*$scope.updateModel = { /*$scope.updateModel = {
"feesType": "", "feesType": "",
"date": "", "date": "",
@ -362,7 +362,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
$http(updateFees).then(function (response) { $http(updateFees).then(function (response) {
if (response.data.status==200 && response.data.setStatus) { if (response.data.status==200 && response.data.setStatus) {
$scope.ldloading5[loading.replace('-', '_')] = false; $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.getStudentSetFees(myModel.ID,myModel.CourseID,myModel.StudentID);
/*$scope.setModel = { /*$scope.setModel = {

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

@ -219,14 +219,14 @@ app.controller('sendSMSsuperadminCtrl', ["$scope", "$filter", "ngTableParams", "
}; };
$http(sendMSGApi).then(function (response) { $http(sendMSGApi).then(function (response) {
if (response.data.msgStatus) { if (response.data.msgStatus) {
swal("Success!", response.data.message, "success"); swal(" ", "Message sent successfully.", "success");
$scope.disableButton = false; $scope.disableButton = false;
angular.forEach($scope.searchResultDetails, function (item) { angular.forEach($scope.searchResultDetails, function (item) {
item.Selected = false; item.Selected = false;
}); });
$scope.OpenWindowStatus = false; $scope.OpenWindowStatus = false;
} else { } else {
swal("Failed!", response.data.message, "error"); swal(" ", response.data.message, "error");
$scope.disableButton = false; $scope.disableButton = false;
} }
}); });

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

@ -81,11 +81,11 @@ $scope.statusForm = {
if (response.data.status == 200 && response.data.Status) { if (response.data.status == 200 && response.data.Status) {
$scope.ldloading1[loading.replace('-', '_')] = false; $scope.ldloading1[loading.replace('-', '_')] = false;
$scope.init(); $scope.init();
swal("Success!", response.data.message, "success"); swal(" ", "Status added successfully.", "success");
$state.go($state.current, {}, { reload: true }); $state.go($state.current, {}, { reload: true });
} else { } else {
$scope.ldloading1[loading.replace('-', '_')] = false; $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) { $http(update).then(function (response) {
if (response.data.status==200 && response.data.Status) { if (response.data.status==200 && response.data.Status) {
$scope.ldloading[loading.replace('-', '_')] = false; $scope.ldloading[loading.replace('-', '_')] = false;
swal("Success!", response.data.message, "success"); swal("", "Updated Successfully", "success");
$scope.editId = -1; $scope.editId = -1;
$scope.init(); $scope.init();
} else { } else {
$scope.ldloading[loading.replace('-', '_')] = false; $scope.ldloading[loading.replace('-', '_')] = false;
swal("Failed!", response.data.message, "error"); swal("", "Something went wrong, please try again", "error");
} }
}); });

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

@ -274,10 +274,10 @@ $scope.studentListLength = 0;
}; };
$http(req).then(function (response) { $http(req).then(function (response) {
if (response.data.addStuCourseStatus == true) { if (response.data.addStuCourseStatus == true) {
swal("Success!", response.data.message, "success"); swal(" ","Student course added successfully.", "success");
$scope.getStudentCourseList($scope.currentStudentId); $scope.getStudentCourseList($scope.currentStudentId);
} else { } else {
swal("Failed!", response.data.message, "error"); swal(" ", response.data.message, "error");
$scope.getStudentCourseList($scope.currentStudentId); $scope.getStudentCourseList($scope.currentStudentId);
} }
}); });
@ -374,12 +374,12 @@ $scope.studentListLength = 0;
}; };
$http(req).then(function (response) { $http(req).then(function (response) {
if (response.data.updateStuCourseStatus) { if (response.data.updateStuCourseStatus) {
swal("Success!", response.data.message, "success"); swal(" ", "Updated successfully.", "success");
$scope.getStudentCourseList($scope.currentStudentId); $scope.getStudentCourseList($scope.currentStudentId);
// $scope.editCourseId = false; // $scope.editCourseId = false;
} else { } else {
// $scope.ldloading1[loading.replace('-', '_')] = false; // $scope.ldloading1[loading.replace('-', '_')] = false;
swal("Failed!", response.data.message, "error"); swal(" ", response.data.message, "error");
$scope.getStudentCourseList($scope.currentStudentId); $scope.getStudentCourseList($scope.currentStudentId);
} }
}); });
@ -605,12 +605,12 @@ $scope.studentListLength = 0;
headers: { 'Content-Type': undefined, 'Process-Data': false }, headers: { 'Content-Type': undefined, 'Process-Data': false },
}).success(function (data) { }).success(function (data) {
if (data.addStudentStatus == true) { if (data.addStudentStatus == true) {
swal("Success!", data.message, "success"); swal(" ", "Student picture added successfully.", "success");
$scope.disableButton = false; $scope.disableButton = false;
$state.go($state.current, {}, { reload: true }); $state.go($state.current, {}, { reload: true });
} else { } else {
// $scope.ldloading1[loading.replace('-', '_')] = false; // $scope.ldloading1[loading.replace('-', '_')] = false;
swal("Failed!", data.message, "error"); swal(" ", data.message, "error");
// $scope.disableButton = false; // $scope.disableButton = false;
} }
}); });
@ -630,12 +630,12 @@ $scope.studentListLength = 0;
}; };
$http(req).then(function (response) { $http(req).then(function (response) {
if (response.data.addStudentStatus == true) { if (response.data.addStudentStatus == true) {
swal("Success!", response.data.message, "success"); swal(" ", "Student added successfully.", "success");
$scope.disableButton = false; $scope.disableButton = false;
$state.go($state.current, {}, { reload: true }); $state.go($state.current, {}, { reload: true });
} else { } else {
// $scope.disableButton = false; // $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) { $http(req).then(function (response) {
if (response.data.updateStuStatus = true) { if (response.data.updateStuStatus = true) {
swal("Success!", response.data.message, "success"); swal(" ", "Updated successfully.", "success");
$scope.getStudentList(); $scope.getStudentList();
$scope.editId = -1; $scope.editId = -1;
} else { } else {
// $scope.ldloading1[loading.replace('-', '_')] = false; // $scope.ldloading1[loading.replace('-', '_')] = false;
swal("Failed!", response.data.message, "error"); swal(" ", response.data.message, "error");
} }
}); });
} else { } else {
@ -839,12 +839,12 @@ $scope.studentListLength = 0;
headers: { 'Content-Type': undefined, 'Process-Data': false }, headers: { 'Content-Type': undefined, 'Process-Data': false },
}).success(function (data) { }).success(function (data) {
if (data.updateStuStatus == true) { if (data.updateStuStatus == true) {
swal("Success!", data.message, "success"); swal(" ","Updated successfully." , "success");
$scope.getStudentList(); $scope.getStudentList();
$scope.editId = -1; $scope.editId = -1;
} else { } else {
// $scope.ldloading1[loading.replace('-', '_')] = false; // $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) { $http(req).then(function (response) {
if (response.data.addStuCourseStatus == true) { if (response.data.addStuCourseStatus == true) {
swal("Success!", response.data.message, "success"); swal(" ","Student course added successfully. ", "success");
$scope.getStudentCourseList($scope.currentStudentId); $scope.getStudentCourseList($scope.currentStudentId);
} else { } else {
swal("Failed!", response.data.message, "error"); swal(" ", response.data.message, "error");
$scope.getStudentCourseList($scope.currentStudentId); $scope.getStudentCourseList($scope.currentStudentId);
} }
}); });
@ -1255,12 +1255,12 @@ $scope.myUnivSearch = "";
}; };
$http(req).then(function (response) { $http(req).then(function (response) {
if (response.data.updateStuCourseStatus) { if (response.data.updateStuCourseStatus) {
swal("Success!", response.data.message, "success"); swal("", "Updated successfully.", "success");
$scope.getStudentCourseList($scope.currentStudentId); $scope.getStudentCourseList($scope.currentStudentId);
// $scope.editCourseId = false; // $scope.editCourseId = false;
} else { } else {
// $scope.ldloading1[loading.replace('-', '_')] = false; // $scope.ldloading1[loading.replace('-', '_')] = false;
swal("Failed!", response.data.message, "error"); swal(" ", response.data.message, "error");
$scope.getStudentCourseList($scope.currentStudentId); $scope.getStudentCourseList($scope.currentStudentId);
} }
}); });
@ -1541,7 +1541,7 @@ $scope.myUnivSearch = "";
headers: { 'Content-Type': undefined, 'Process-Data': false }, headers: { 'Content-Type': undefined, 'Process-Data': false },
}).success(function (data) { }).success(function (data) {
if (data.addStudentStatus == true) { if (data.addStudentStatus == true) {
swal("Success!", data.message, "success"); swal(" ", "Student picture added successfully.", "success");
$scope.disableButton = false; $scope.disableButton = false;
$scope.viewStudentDetailsPage = false; $scope.viewStudentDetailsPage = false;
// $state.go($state.current, {}, { reload: true }); // $state.go($state.current, {}, { reload: true });
@ -1551,7 +1551,7 @@ $scope.myUnivSearch = "";
// $scope.tabActive('tabactive1'); // $scope.tabActive('tabactive1');
} else { } else {
// $scope.ldloading1[loading.replace('-', '_')] = false; // $scope.ldloading1[loading.replace('-', '_')] = false;
swal("Failed!", data.message, "error"); swal(" ", data.message, "error");
} }
}); });
} else { } else {
@ -1570,7 +1570,7 @@ $scope.myUnivSearch = "";
}; };
$http(req).then(function (response) { $http(req).then(function (response) {
if (response.data.addStudentStatus == true) { if (response.data.addStudentStatus == true) {
swal("Success!", response.data.message, "success"); swal( "", "Student added successfully.", "success");
$scope.disableButton = false; $scope.disableButton = false;
$scope.viewStudentDetailsPage = false; $scope.viewStudentDetailsPage = false;
// $state.go($state.current, {}, { reload: true }); // $state.go($state.current, {}, { reload: true });
@ -1581,7 +1581,7 @@ $scope.myUnivSearch = "";
// $scope.tabActive('tabactive1'); // $scope.tabActive('tabactive1');
} else { } else {
// $scope.disableButton = false; // $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) { $http(req).then(function (response) {
if (response.data.updateStuStatus = true) { if (response.data.updateStuStatus = true) {
swal("Success!", response.data.message, "success"); swal(" ", "Updated successfully.", "success");
$scope.getStudentList(); $scope.getStudentList();
$scope.editId = -1; $scope.editId = -1;
} else { } else {
// $scope.ldloading1[loading.replace('-', '_')] = false; // $scope.ldloading1[loading.replace('-', '_')] = false;
swal("Failed!", response.data.message, "error"); swal(" ", response.data.message, "error");
} }
}); });
} else { } else {
@ -1785,12 +1785,12 @@ $scope.myUnivSearch = "";
headers: { 'Content-Type': undefined, 'Process-Data': false }, headers: { 'Content-Type': undefined, 'Process-Data': false },
}).success(function (data) { }).success(function (data) {
if (data.updateStuStatus == true) { if (data.updateStuStatus == true) {
swal("Success!", data.message, "success"); swal(" ", "Updated successfully.", "success");
$scope.getStudentList(); $scope.getStudentList();
$scope.editId = -1; $scope.editId = -1;
} else { } else {
// $scope.ldloading1[loading.replace('-', '_')] = false; // $scope.ldloading1[loading.replace('-', '_')] = false;
swal("Failed!", data.message, "error"); swal(" ", data.message, "error");
} }
}); });
} }

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

@ -137,14 +137,14 @@ app.controller("studentStatusUpdateCtrl", ["$scope", "toaster", "$filter", "API_
if (response.data.status==200 && response.data.activityStatus) { if (response.data.status==200 && response.data.activityStatus) {
$scope.ldloading3[loading.replace('-', '_')] = false; $scope.ldloading3[loading.replace('-', '_')] = false;
swal("Success!", response.data.message, "success"); swal("", "Status Updated Successfully.", "success");
$scope.init(); $scope.init();
$scope.editId = -1; $scope.editId = -1;
} else { } else {
$scope.ldloading3[loading.replace('-', '_')] = false; $scope.ldloading3[loading.replace('-', '_')] = false;
swal("Failed!", response.data.message, "error"); swal(" ", " Something went wrong, please try again.", "error");
} }
}); });
} }

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

@ -342,7 +342,7 @@ app.controller('studyMaterialStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
}; };
$http(updateStudyMaterial).then(function (response) { $http(updateStudyMaterial).then(function (response) {
if (response.data.addStatus) { if (response.data.addStatus) {
swal("Success!", response.data.message, "success"); swal(" ", "Updated successfully.", "success");
$scope.disableButton = false; $scope.disableButton = false;
// for success state // for success state
// $scope.allSelected('undefined'); // $scope.allSelected('undefined');
@ -351,7 +351,7 @@ app.controller('studyMaterialStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
}); });
$scope.OpenWindowStatus = false; $scope.OpenWindowStatus = false;
} else { } else {
swal("Failed!", response.data.message, "error"); swal(" ", response.data.message, "error");
$scope.disableButton = false; $scope.disableButton = false;
} }
}); });

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

@ -9,7 +9,6 @@ app.controller('universityCtrl', ["$scope", "toaster", "$filter", "ngTableParams
* university details capture * university details capture
* by : kdk * by : kdk
*/ */
// get local cliend details // get local cliend details
var localDetail = JSON.parse(localStorage.getItem('localObj')); var localDetail = JSON.parse(localStorage.getItem('localObj'));
var localDetails = ipCookie('cookiechk'); var localDetails = ipCookie('cookiechk');
@ -75,7 +74,7 @@ app.controller('universityCtrl', ["$scope", "toaster", "$filter", "ngTableParams
}; };
$http(checkReq).then(function (response) { $http(checkReq).then(function (response) {
if (response.data.existUniv === true) { if (response.data.existUniv === true) {
swal("Warning!", response.data.message, "warning"); swal("", "University Id already exists", "warning");
$scope.myModel.UniversityID = ''; $scope.myModel.UniversityID = '';
} else { } else {
} }
@ -123,12 +122,12 @@ app.controller('universityCtrl', ["$scope", "toaster", "$filter", "ngTableParams
}; };
$http(req).then(function (response) { $http(req).then(function (response) {
if (response.data.updateUniversityStatus = true) { if (response.data.updateUniversityStatus = true) {
swal("Success!", response.data.message, "success"); swal(" ", "Updated successfully.", "success");
$scope.getUniversityList(); $scope.getUniversityList();
$scope.editId = -1; $scope.editId = -1;
} else { } else {
// $scope.ldloading1[loading.replace('-', '_')] = false; // $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) { $http(req).then(function (response) {
if (response.data.addUniv == true) { if (response.data.addUniv == true) {
swal("Success!", response.data.message, "success"); swal("", "University details added successfully.", "success");
$state.go($state.current, {}, { reload: true }); $state.go($state.current, {}, { reload: true });
} else { } else {
// $scope.ldloading1[loading.replace('-', '_')] = false; // $scope.ldloading1[loading.replace('-', '_')] = false;
swal("Failed!", response.data.message, "error"); swal("","Something went wrong, please try again.", "error");
} }
}); });
} }

12
Apollo/assets/views/activity.html
View File

@ -11,10 +11,10 @@
<section id="page-title"> <section id="page-title">
<div class="row"> <div class="row">
<div class="col-sm-8"> <div class="col-sm-8">
<h1 class="mainTitle" translate="Activity Details"></h1> <h1 class="mainTitle" translate="Activity"></h1>
<!--
<span class="mainDescription">Over a dozen reusable components built to provide popovers, media objects, navigation, tooltips and much more. </span> <span class="mainDescription">Add / Edit Activity list used for call tracking. </span>
-->
</div> </div>
<div ncy-breadcrumb></div> <div ncy-breadcrumb></div>
</div> </div>
@ -91,7 +91,7 @@
Submit Submit
</button>--> </button>-->
<button type="submit" ladda="ldloading.zoom_in" tabindex="4" class="btn btn-wide btn-success" data-style="zoom-in"> <button type="submit" ladda="ldloading.zoom_in" tabindex="4" class="btn btn-wide btn-success" data-style="zoom-in">
Submit Add
</button> </button>
</div> </div>
</div> </div>
@ -137,7 +137,7 @@
<td>{{p.ActivityID}}</td> <td>{{p.ActivityID}}</td>
<td>{{p.ActivityName}}</td> <td>{{p.ActivityName}}</td>
<td>{{p.Description}}</td> <td>{{p.Description}}</td>
<td><span ng-if="p.IsActive == 1"> Active </span><span ng-if="p.IsActive == 0">De-Active</span></td> <td><span ng-if="p.IsActive == 1"> Active </span><span ng-if="p.IsActive == 0">In-Active</span></td>
<td> <td>
<a class="text-azure" id="editRowBtn{{p.ActivityID}}" ng-click="setEditId(p);"><b class="fa fa-hover fa-pencil " aria-hidden="true"></b> <a class="text-azure" id="editRowBtn{{p.ActivityID}}" ng-click="setEditId(p);"><b class="fa fa-hover fa-pencil " aria-hidden="true"></b>
</a> </a>

16
Apollo/assets/views/announcement/Announcement.html
View File

@ -12,8 +12,8 @@
<section id="page-title"> <section id="page-title">
<div class="row"> <div class="row">
<div class="col-sm-8"> <div class="col-sm-8">
<h1 class="mainTitle" translate="Add/View Announcement Details">{{ mainTitle }}</h1> <h1 class="mainTitle" translate="Announcement ">{{ mainTitle }}</h1>
<span class="mainDescription">Add/View Announcement Details. </span>
</div> </div>
<div ncy-breadcrumb></div> <div ncy-breadcrumb></div>
</div> </div>
@ -59,7 +59,7 @@
<table class="table table-hover"> <table class="table table-hover">
<thead> <thead>
<tr> <tr>
<th ng-click="sort('Heading')">Heading <th ng-click="sort('Heading')">Title
<span class="glyphicon sort-icon" ng-show="sortKey=='Heading'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span> <span class="glyphicon sort-icon" ng-show="sortKey=='Heading'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
</th> </th>
<!--<th ng-click="sort('description')">Description <!--<th ng-click="sort('description')">Description
@ -75,7 +75,7 @@
<tr> <tr>
<td>{{p.Heading}}</td> <td>{{p.Heading}}</td>
<!--<td>{{p.description}}</td>--> <!--<td>{{p.description}}</td>-->
<td><span ng-if="p.IsActive == 1"> Active </span><span ng-if="p.IsActive == 0">De-Active</span></td> <td><span ng-if="p.IsActive == 1"> Active </span><span ng-if="p.IsActive == 0">In-Active</span></td>
<td> <td>
<a class="text-azure" id="editRowBtn{{p.ID}}" ng-click="setEditId(p.ID);"><b class="fa fa-hover fa-pencil " aria-hidden="true"></b> <a class="text-azure" id="editRowBtn{{p.ID}}" ng-click="setEditId(p.ID);"><b class="fa fa-hover fa-pencil " aria-hidden="true"></b>
</a></td> </a></td>
@ -112,22 +112,22 @@
<div class="col-md-12 form-group"> <div class="col-md-12 form-group">
<div class="col-md-2"> <div class="col-md-2">
<label> <label>
Heading <span class="symbol required"></span> Title <span class="symbol required"></span>
</label> </label>
</div> </div>
<div class="col-md-10" ng-class="{'has-error':Form.Heading.$dirty && Form.Heading.$invalid, 'has-success':Form.Heading.$valid}"> <div class="col-md-10" ng-class="{'has-error':Form.Heading.$dirty && Form.Heading.$invalid, 'has-success':Form.Heading.$valid}">
<input type="text" placeholder="Enter Heading Name" <input type="text" placeholder="Enter Title"
tabindex="2" class="form-control" name="Heading" tabindex="2" class="form-control" name="Heading"
ng-model="myModel.Heading" required/> ng-model="myModel.Heading" required/>
<span class="error text-small block" <span class="error text-small block"
ng-if="Form.Heading.$dirty && Form.Heading.$error.required">Heading is required</span> ng-if="Form.Heading.$dirty && Form.Heading.$error.required">Title is required</span>
</div> </div>
</div> </div>
<div class="col-md-12 form-group"> <div class="col-md-12 form-group">
<div class="col-md-2"> <div class="col-md-2">
<label> <label>
Description <span class="symbol required"></span> Message <span class="symbol required"></span>
</label> </label>
</div> </div>
<div class="col-md-10"> <div class="col-md-10">

8
Apollo/assets/views/announcement/editAnnouncementDetails.html
View File

@ -16,15 +16,15 @@
<div class="col-md-2"> <div class="col-md-2">
<label> <label>
Heading <span class="symbol required"></span> Title <span class="symbol required"></span>
</label> </label>
</div> </div>
<div class="col-md-10" ng-class="{'has-error':Form.Heading.$dirty && Form.Heading.$invalid, 'has-success':Form.Heading.$valid}"> <div class="col-md-10" ng-class="{'has-error':Form.Heading.$dirty && Form.Heading.$invalid, 'has-success':Form.Heading.$valid}">
<input type="text" placeholder="Enter Heading Name" <input type="text" placeholder="Enter Title"
tabindex="1" class="form-control" name="Heading" tabindex="1" class="form-control" name="Heading"
ng-model="p.Heading" required/> ng-model="p.Heading" required/>
<span class="error text-small block" <span class="error text-small block"
ng-if="Form.Heading.$dirty && Form.Heading.$error.required">Heading is required</span> ng-if="Form.Heading.$dirty && Form.Heading.$error.required">Title is required</span>
</div> </div>
@ -35,7 +35,7 @@
<div class="col-md-12 form-group"> <div class="col-md-12 form-group">
<div class="col-md-2"> <div class="col-md-2">
<label> <label>
Description <span class="symbol required"></span> Message <span class="symbol required"></span>
</label> </label>
</div> </div>
<div class="col-md-10"> <div class="col-md-10">

10
Apollo/assets/views/batch.html
View File

@ -12,10 +12,10 @@
<section id="page-title"> <section id="page-title">
<div class="row"> <div class="row">
<div class="col-sm-8"> <div class="col-sm-8">
<h1 class="mainTitle" translate="Add/View Batch Details"></h1> <h1 class="mainTitle" translate="Batch"></h1>
<!--
<span class="mainDescription">Over a dozen reusable components built to provide popovers, media objects, navigation, tooltips and much more. </span> <span class="mainDescription">Add/View Batch Details. </span>
-->
</div> </div>
<div ncy-breadcrumb></div> <div ncy-breadcrumb></div>
</div> </div>
@ -82,7 +82,7 @@
<td>{{p.BatchCode}}</td> <td>{{p.BatchCode}}</td>
<td>{{p.BatchName}}</td> <td>{{p.BatchName}}</td>
<td>{{p.UniversityName}}</td> <td>{{p.UniversityName}}</td>
<td><span ng-if="p.IsActive == 1"> Active </span><span ng-if="p.IsActive == 0">De-Active</span></td> <td><span ng-if="p.IsActive == 1"> Active </span><span ng-if="p.IsActive == 0">In-Active</span></td>
<td> <td>
<a class="text-azure" id="editRowBtn{{p.BatchCode}}" ng-click="setEditId(p.BatchCode);"><b class="fa fa-hover fa-pencil " aria-hidden="true"></b> <a class="text-azure" id="editRowBtn{{p.BatchCode}}" ng-click="setEditId(p.BatchCode);"><b class="fa fa-hover fa-pencil " aria-hidden="true"></b>

12
Apollo/assets/views/branchDetails.html
View File

@ -10,10 +10,10 @@
<section id="page-title"> <section id="page-title">
<div class="row"> <div class="row">
<div class="col-sm-8"> <div class="col-sm-8">
<h1 class="mainTitle" translate="Add/View Branch Details">{{ mainTitle }}</h1> <h1 class="mainTitle" translate="Branch">{{ mainTitle }}</h1>
<!--
<span class="mainDescription">Over a dozen reusable components built to provide popovers, media objects, navigation, tooltips and much more. </span> <span class="mainDescription">Add/View Branch Details. </span>
-->
</div> </div>
<div ncy-breadcrumb></div> <div ncy-breadcrumb></div>
</div> </div>
@ -98,7 +98,7 @@
<td>{{p.MobileNumber}}</td> <td>{{p.MobileNumber}}</td>
<!-- <td>{{p.AlternateNumber}}</td>--> <!-- <td>{{p.AlternateNumber}}</td>-->
<td>{{p.LandlineNumber}}</td> <td>{{p.LandlineNumber}}</td>
<td><span ng-if="p.IsActive == 1"> Active </span><span ng-if="p.IsActive == 0">De-Active</span></td> <td><span ng-if="p.IsActive == 1"> Active </span><span ng-if="p.IsActive == 0">In-Active</span></td>
<td> <td>
<a class="text-azure" id="editRowBtn{{p.BranchCode}}" ng-click="setEditId(p.BranchCode);"><b class="fa fa-hover fa-pencil " aria-hidden="true"></b> <a class="text-azure" id="editRowBtn{{p.BranchCode}}" ng-click="setEditId(p.BranchCode);"><b class="fa fa-hover fa-pencil " aria-hidden="true"></b>
</a></td> </a></td>
@ -184,7 +184,7 @@
</label> </label>
<input type="email" tabindex="3" placeholder="Enter Email ID" class="form-control" name="Email" ng-pattern="/^[-a-z0-9~!$%^&*_=+}{\'?]+(\.[-a-z0-9~!$%^&*_=+}{\'?]+)*@([a-z0-9_][-a-z0-9_]*(\.[-a-z0-9_]+)*\.(aero|arpa|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org|pro|travel|mobi|[a-z][a-z])|([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}))(:[0-9]{1,5})?$/i" <input type="email" tabindex="3" placeholder="Enter Email ID" class="form-control" name="Email" ng-pattern="/^[-a-z0-9~!$%^&*_=+}{\'?]+(\.[-a-z0-9~!$%^&*_=+}{\'?]+)*@([a-z0-9_][-a-z0-9_]*(\.[-a-z0-9_]+)*\.(aero|arpa|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org|pro|travel|mobi|[a-z][a-z])|([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}))(:[0-9]{1,5})?$/i"
ng-model="myModel.email" required> ng-model="myModel.email" required>
<span class="error text-small block" ng-if="Form.Email.$dirty && Form.primaryEmail.$invalid" ng-hide="Form.Email.$error.email">Email is required.</span> <span class="error text-small block" ng-if="Form.Email.$dirty && Form.Email.$invalid" ng-hide="Form.Email.$error.email">Email is required.</span>
<span class="error text-small block" ng-if="Form.Email.$error.email">Please, enter a valid email address.</span> <span class="error text-small block" ng-if="Form.Email.$error.email">Please, enter a valid email address.</span>
<!--<span style="color:#000" class="success text-small" <!--<span style="color:#000" class="success text-small"
ng-if="Form.primaryEmail.$valid">It's a valid e-mail!</span>--> ng-if="Form.primaryEmail.$valid">It's a valid e-mail!</span>-->

23
Apollo/assets/views/callTrackingCloseDetails.html
View File

@ -22,10 +22,9 @@
<div class="row"> <div class="row">
<div class="col-sm-8"> <div class="col-sm-8">
<h1 class="mainTitle" translate="Recent Close Tracking Details">{{ mainTitle }}</h1> <h1 class="mainTitle" translate="Closed leads">{{ mainTitle }}</h1>
<!-- <span class="mainDescription">View all closed leads. </span>
<span class="mainDescription">Over a dozen reusable components built to provide popovers, media objects, navigation, tooltips and much more. </span>
-->
</div> </div>
<div ncy-breadcrumb></div> <div ncy-breadcrumb></div>
</div> </div>
@ -69,17 +68,17 @@
<thead> <thead>
<tr > <tr >
<th></th> <th></th>
<th ng-click="sort('TrackingID')">Tracking ID <th ng-click="sort('TrackingID')">ID
<span class="glyphicon sort-icon" ng-show="sortKey=='TrackingID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span> <span class="glyphicon sort-icon" ng-show="sortKey=='TrackingID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
</th> </th>
<th ng-click="sort('followupDetails')">Followup On <th ng-click="sort('followupDetails')">Followup
<span class="glyphicon sort-icon" ng-show="sortKey=='followupDetails'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span> <span class="glyphicon sort-icon" ng-show="sortKey=='followupDetails'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
</th> </th>
<th ng-click="sort('LeadName')">Student Name <th ng-click="sort('LeadName')">Name
<span class="glyphicon sort-icon" ng-show="sortKey=='LeadName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span> <span class="glyphicon sort-icon" ng-show="sortKey=='LeadName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
</th> </th>
<th ng-click="sort('MobileNumber')">Mobile Number <th ng-click="sort('MobileNumber')">Mobile
<span class="glyphicon sort-icon" ng-show="sortKey=='MobileNumber'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span> <span class="glyphicon sort-icon" ng-show="sortKey=='MobileNumber'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
</th> </th>
@ -87,8 +86,8 @@
<th>Course</th> <th>Course</th>
<th>Activity <th>Activity
</th> </th>
<th>Assigned To</th> <th>Assigned </th>
<th>Created On</th> <th>Created </th>
<th>Status</th> <th>Status</th>
</tr> </tr>
@ -97,10 +96,10 @@
<tr> <tr>
<td ng-if="p.Flag==false"> <td ng-if="p.Flag==false">
<a class="glyphicon ng-scope fa margin-right-5 fa-flag text-grey text-extra-large" tooltip="Important" ng-click="markAsImportant(p.TrackingID,true);"></a> <a class="glyphicon ng-scope fa margin-right-5 fa-flag text-grey text-extra-large" tooltip="Potential" ng-click="markAsImportant(p.TrackingID,true);"></a>
</td> </td>
<td ng-if="p.Flag==true"> <td ng-if="p.Flag==true">
<a class="glyphicon ng-scope fa margin-right-5 fa-flag text-purple text-extra-large" tooltip="Important" ng-click="markAsImportant(p.TrackingID,false);"></a> <a class="glyphicon ng-scope fa margin-right-5 fa-flag text-purple text-extra-large" tooltip="Potential" ng-click="markAsImportant(p.TrackingID,false);"></a>
</td> </td>
<td><a class="text-orange" ng-click="setEditId(p,'','','','','',myModel.search);">{{p.TrackingID}}</a></td> <td><a class="text-orange" ng-click="setEditId(p,'','','','','',myModel.search);">{{p.TrackingID}}</a></td>

37
Apollo/assets/views/callTrackingDetails.html
View File

@ -22,10 +22,10 @@
<div class="row"> <div class="row">
<div class="col-sm-8"> <div class="col-sm-8">
<h1 class="mainTitle" translate="Call Tracking Details">{{ mainTitle }}</h1> <h1 class="mainTitle" translate="Add/View leads details">{{ mainTitle }}</h1>
<!--
<span class="mainDescription">Over a dozen reusable components built to provide popovers, media objects, navigation, tooltips and much more. </span> <span class="mainDescription">Manage new leads. </span>
-->
</div> </div>
<div ncy-breadcrumb></div> <div ncy-breadcrumb></div>
</div> </div>
@ -88,19 +88,19 @@
</div> </div>
<div class="col-md-2"> <div class="col-md-2">
<input class="form-control" type="text" ng-model="search2" id="search2" autofocus tabindex="2" placeholder="Search " /> <input class="form-control" type="text" ng-model="search2" id="search2" autofocus tabindex="2" placeholder="Search anything" />
</div> </div>
<!-- Search By Activity--> <!-- Search By Activity-->
<div class="col-md-2 col-md"> <div class="col-md-2 col-md">
<input class="form-control" type="text" ng-model="search3.ActivityName" id="search3" autofocus tabindex="3" placeholder="Search Activity" /> <input class="form-control" type="text" ng-model="search3.ActivityName" id="search3" autofocus tabindex="3" placeholder=" Activity" />
</div> </div>
<!-- Search By Assign To--> <!-- Search By Assign To-->
<div class="col-md-2"> <div class="col-md-2">
<input class="form-control" type="text" ng-model="search4.Firstname" id="search4" autofocus tabindex="4" placeholder="Search Assigned To" /> <input class="form-control" type="text" ng-model="search4.Firstname" id="search4" autofocus tabindex="4" placeholder=" Assigned To" />
</div> </div>
<!-- Search By Status--> <!-- Search By Status-->
<div class="col-md-2"> <div class="col-md-2">
<input class="form-control" type="text" ng-model="search5.statusName" id="search5" autofocus tabindex="5" placeholder="Search Status" /> <input class="form-control" type="text" ng-model="search5.statusName" id="search5" autofocus tabindex="5" placeholder="Status" />
</div> </div>
<br><br> <br><br>
</div> </div>
@ -129,25 +129,24 @@
<thead> <thead>
<tr> <tr>
<th></th> <th></th>
<th ng-click="sort('TrackingID')">Tracking ID <th ng-click="sort('TrackingID')"> ID
<span class="glyphicon sort-icon" ng-show="sortKey=='TrackingID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span> <span class="glyphicon sort-icon" ng-show="sortKey=='TrackingID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
</th> </th>
<th ng-click="sort('followupDetails')">Followup On <th ng-click="sort('followupDetails')">Followup
<span class="glyphicon sort-icon" ng-show="sortKey=='followupDetails'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span> <span class="glyphicon sort-icon" ng-show="sortKey=='followupDetails'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
</th> </th>
<th ng-click="sort('LeadName')">Student Name <th ng-click="sort('LeadName')"> Name
<span class="glyphicon sort-icon" ng-show="sortKey=='LeadName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span> <span class="glyphicon sort-icon" ng-show="sortKey=='LeadName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
</th> </th>
<th ng-click="sort('MobileNumber')">Mobile Number <th ng-click="sort('MobileNumber')">Mobile
<span class="glyphicon sort-icon" ng-show="sortKey=='MobileNumber'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span> <span class="glyphicon sort-icon" ng-show="sortKey=='MobileNumber'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
</th> </th>
<th>University</th> <th>University</th>
<th>Course</th> <th>Course</th>
<th>Activity <th>Activity </th>
</th> <th>Assigned </th>
<th>Assigned To</th>
<th>Status</th> <th>Status</th>
</tr> </tr>
@ -155,10 +154,10 @@
<tbody dir-paginate="p in data|unique:'TrackingID' |orderBy:sortKey:reverse|filter:search2:strict| filter:search3:strict| filter:search4:strict| filter:search5:strict|itemsPerPage:10"> <tbody dir-paginate="p in data|unique:'TrackingID' |orderBy:sortKey:reverse|filter:search2:strict| filter:search3:strict| filter:search4:strict| filter:search5:strict|itemsPerPage:10">
<tr> <tr>
<td ng-if="p.Flag==false"> <td ng-if="p.Flag==false">
<a class="glyphicon ng-scope fa margin-right-5 fa-flag text-grey text-extra-large" tooltip="Important" ng-click="markAsImportant(p.TrackingID,true);"></a> <a class="glyphicon ng-scope fa margin-right-5 fa-flag text-grey text-extra-large" tooltip="Potential" ng-click="markAsImportant(p.TrackingID,true);"></a>
</td> </td>
<td ng-if="p.Flag==true"> <td ng-if="p.Flag==true">
<a class="glyphicon ng-scope fa margin-right-5 fa-flag text-purple text-extra-large" tooltip="Important" ng-click="markAsImportant(p.TrackingID,false);"></a> <a class="glyphicon ng-scope fa margin-right-5 fa-flag text-purple text-extra-large" tooltip="Potential" ng-click="markAsImportant(p.TrackingID,false);"></a>
</td> </td>
<td><a tooltip="Click To View" class="text-orange" ng-click="setEditId(p,search,search2,search3.ActivityName,search4.Firstname,search5.statusName,myModel.search,myModel.dateTo);">{{p.TrackingID}}</a></td> <td><a tooltip="Click To View" class="text-orange" ng-click="setEditId(p,search,search2,search3.ActivityName,search4.Firstname,search5.statusName,myModel.search,myModel.dateTo);">{{p.TrackingID}}</a></td>
<td>{{p.followupDetails }}</td> <td>{{p.followupDetails }}</td>
@ -333,7 +332,7 @@
<div class="col-md-3 form-group" <div class="col-md-3 form-group"
ng-class="{'has-error':Form.date.$dirty && Form.date.$invalid, 'has-success':Form.date.$valid}"> ng-class="{'has-error':Form.date.$dirty && Form.date.$invalid, 'has-success':Form.date.$valid}">
<label> <label>
Date <span Followup Date <span
class="symbol required"></span> class="symbol required"></span>
</label> </label>
<input type="text" <input type="text"
@ -350,7 +349,7 @@
max-date="futureDate" max-date="futureDate"
close-text="Close" required="required"/> close-text="Close" required="required"/>
<span class="error text-small block" <span class="error text-small block"
ng-if="Form.date.$dirty && Form.date.$error.required">Date is required.</span> ng-if="Form.date.$dirty && Form.date.$error.required">Followup Date is required.</span>
<!--<span class="success text-small block"--> <!--<span class="success text-small block"-->
<!--ng-if="Form.date.$valid ">Thank You</span>--> <!--ng-if="Form.date.$valid ">Thank You</span>-->
</div> </div>

24
Apollo/assets/views/callTrackingLeadDetails.html
View File

@ -22,10 +22,10 @@
<div class="row"> <div class="row">
<div class="col-sm-8"> <div class="col-sm-8">
<h1 class="mainTitle" translate="Recent Lead Details">{{ mainTitle }}</h1> <h1 class="mainTitle" translate="Day wise leads.">{{ mainTitle }}</h1>
<!--
<span class="mainDescription">Over a dozen reusable components built to provide popovers, media objects, navigation, tooltips and much more. </span> <span class="mainDescription">Leads created on a given date. </span>
-->
</div> </div>
<div ncy-breadcrumb></div> <div ncy-breadcrumb></div>
</div> </div>
@ -69,17 +69,17 @@
<thead> <thead>
<tr > <tr >
<th></th> <th></th>
<th ng-click="sort('TrackingID')">Tracking ID <th ng-click="sort('TrackingID')">ID
<span class="glyphicon sort-icon" ng-show="sortKey=='TrackingID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span> <span class="glyphicon sort-icon" ng-show="sortKey=='TrackingID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
</th> </th>
<th ng-click="sort('followupDetails')">Followup On <th ng-click="sort('followupDetails')">Followup
<span class="glyphicon sort-icon" ng-show="sortKey=='followupDetails'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span> <span class="glyphicon sort-icon" ng-show="sortKey=='followupDetails'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
</th> </th>
<th ng-click="sort('LeadName')">Student Name <th ng-click="sort('LeadName')">Name
<span class="glyphicon sort-icon" ng-show="sortKey=='LeadName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span> <span class="glyphicon sort-icon" ng-show="sortKey=='LeadName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
</th> </th>
<th ng-click="sort('MobileNumber')">Mobile Number <th ng-click="sort('MobileNumber')">Mobile
<span class="glyphicon sort-icon" ng-show="sortKey=='MobileNumber'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span> <span class="glyphicon sort-icon" ng-show="sortKey=='MobileNumber'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
</th> </th>
@ -87,8 +87,8 @@
<th>Course</th> <th>Course</th>
<th>Activity <th>Activity
</th> </th>
<th>Assigned To</th> <th>Assigned </th>
<th>Created On</th> <th>Created </th>
<th>Status</th> <th>Status</th>
</tr> </tr>
@ -96,10 +96,10 @@
<tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|filter:search2:strict| filter:search3:strict| filter:search4:strict| filter:search5:strict|itemsPerPage:10"> <tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|filter:search2:strict| filter:search3:strict| filter:search4:strict| filter:search5:strict|itemsPerPage:10">
<tr> <tr>
<td ng-if="p.Flag==false"> <td ng-if="p.Flag==false">
<a class="glyphicon ng-scope fa margin-right-5 fa-flag text-grey text-extra-large" tooltip="Important" ng-click="markAsImportant(p.TrackingID,true);"></a> <a class="glyphicon ng-scope fa margin-right-5 fa-flag text-grey text-extra-large" tooltip="Potential" ng-click="markAsImportant(p.TrackingID,true);"></a>
</td> </td>
<td ng-if="p.Flag==true"> <td ng-if="p.Flag==true">
<a class="glyphicon ng-scope fa margin-right-5 fa-flag text-purple text-extra-large" tooltip="Important" ng-click="markAsImportant(p.TrackingID,false);"></a> <a class="glyphicon ng-scope fa margin-right-5 fa-flag text-purple text-extra-large" tooltip="Potential" ng-click="markAsImportant(p.TrackingID,false);"></a>
</td> </td>
<td><a class="text-orange" ng-click="setEditId(p,'','','','','',myModel.search);">{{p.TrackingID}}</a></td> <td><a class="text-orange" ng-click="setEditId(p,'','','','','',myModel.search);">{{p.TrackingID}}</a></td>
<td>{{p.followupDetails }}</td> <td>{{p.followupDetails }}</td>

24
Apollo/assets/views/callTrackingPendingDetails.html
View File

@ -22,10 +22,10 @@
<div class="row"> <div class="row">
<div class="col-sm-8"> <div class="col-sm-8">
<h1 class="mainTitle" translate="Recent Pending Tracking Details">{{ mainTitle }}</h1> <h1 class="mainTitle" translate="Pending leads">{{ mainTitle }}</h1>
<!--
<span class="mainDescription">Over a dozen reusable components built to provide popovers, media objects, navigation, tooltips and much more. </span> <span class="mainDescription">View all pending leads.</span>
-->
</div> </div>
<div ncy-breadcrumb></div> <div ncy-breadcrumb></div>
</div> </div>
@ -69,17 +69,17 @@
<thead> <thead>
<tr > <tr >
<th></th> <th></th>
<th ng-click="sort('TrackingID')">Tracking ID <th ng-click="sort('TrackingID')">ID
<span class="glyphicon sort-icon" ng-show="sortKey=='TrackingID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span> <span class="glyphicon sort-icon" ng-show="sortKey=='TrackingID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
</th> </th>
<th ng-click="sort('followupDetails')">Followup On <th ng-click="sort('followupDetails')">Followup
<span class="glyphicon sort-icon" ng-show="sortKey=='followupDetails'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span> <span class="glyphicon sort-icon" ng-show="sortKey=='followupDetails'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
</th> </th>
<th ng-click="sort('LeadName')">Student Name <th ng-click="sort('LeadName')">Name
<span class="glyphicon sort-icon" ng-show="sortKey=='LeadName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span> <span class="glyphicon sort-icon" ng-show="sortKey=='LeadName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
</th> </th>
<th ng-click="sort('MobileNumber')">Mobile Number <th ng-click="sort('MobileNumber')">Mobile
<span class="glyphicon sort-icon" ng-show="sortKey=='MobileNumber'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span> <span class="glyphicon sort-icon" ng-show="sortKey=='MobileNumber'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
</th> </th>
@ -87,8 +87,8 @@
<th>Course</th> <th>Course</th>
<th>Activity <th>Activity
</th> </th>
<th>Assigned To</th> <th>Assigned</th>
<th>Created On</th> <th>Created</th>
<th>Status</th> <th>Status</th>
</tr> </tr>
@ -96,10 +96,10 @@
<tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|filter:search2:strict| filter:search3:strict| filter:search4:strict| filter:search5:strict|itemsPerPage:10"> <tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|filter:search2:strict| filter:search3:strict| filter:search4:strict| filter:search5:strict|itemsPerPage:10">
<tr> <tr>
<td ng-if="p.Flag==false"> <td ng-if="p.Flag==false">
<a class="glyphicon ng-scope fa margin-right-5 fa-flag text-grey text-extra-large" tooltip="Important" ng-click="markAsImportant(p.TrackingID,true);"></a> <a class="glyphicon ng-scope fa margin-right-5 fa-flag text-grey text-extra-large" tooltip="Potential" ng-click="markAsImportant(p.TrackingID,true);"></a>
</td> </td>
<td ng-if="p.Flag==true"> <td ng-if="p.Flag==true">
<a class="glyphicon ng-scope fa margin-right-5 fa-flag text-purple text-extra-large" tooltip="Important" ng-click="markAsImportant(p.TrackingID,false);"></a> <a class="glyphicon ng-scope fa margin-right-5 fa-flag text-purple text-extra-large" tooltip="Potential" ng-click="markAsImportant(p.TrackingID,false);"></a>
</td> </td>
<td><a class="text-orange" ng-click="setEditId(p,'','','','','',myModel.search);">{{p.TrackingID}}</a></td> <td><a class="text-orange" ng-click="setEditId(p,'','','','','',myModel.search);">{{p.TrackingID}}</a></td>
<td>{{p.followupDetails }}</td> <td>{{p.followupDetails }}</td>

12
Apollo/assets/views/courseDetails.html
View File

@ -12,10 +12,10 @@
<section id="page-title"> <section id="page-title">
<div class="row"> <div class="row">
<div class="col-sm-8"> <div class="col-sm-8">
<h1 class="mainTitle" translate="Add/View Course Details">{{ mainTitle }}</h1> <h1 class="mainTitle" translate="Course ">{{ mainTitle }}</h1>
<!--
<span class="mainDescription">Over a dozen reusable components built to provide popovers, media objects, navigation, tooltips and much more. </span> <span class="mainDescription">Add/View Course Details. </span>
-->
</div> </div>
<div ncy-breadcrumb></div> <div ncy-breadcrumb></div>
</div> </div>
@ -78,10 +78,10 @@
</thead> </thead>
<tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10"> <tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10">
<tr> <tr>
<td>{{p.CourseID}}</td> <td>{{p.CourseCode}}</td>
<td>{{p.CourseName}}</td> <td>{{p.CourseName}}</td>
<td>{{p.UniversityName}}</td> <td>{{p.UniversityName}}</td>
<td><span ng-if="p.IsActive == 1"> Active </span><span ng-if="p.IsActive == 0">De-Active</span></td> <td><span ng-if="p.IsActive == 1"> Active </span><span ng-if="p.IsActive == 0">In-Active</span></td>
<td> <td>
<a class="text-azure" id="editRowBtn{{p.CourseID}}" ng-click="setEditId(p.CourseID,p);"><b class="fa fa-hover fa-pencil " aria-hidden="true"></b> <a class="text-azure" id="editRowBtn{{p.CourseID}}" ng-click="setEditId(p.CourseID,p);"><b class="fa fa-hover fa-pencil " aria-hidden="true"></b>
</a> </a>

122
Apollo/assets/views/dashboard.html
View File

@ -4,23 +4,26 @@
} }
</style> </style>
<!-- start: DASHBOARD TITLE --> <!-- start: DASHBOARD TITLE -->
<section id="page-title" class="padding-top-15 padding-bottom-15"> <!--<section id="page-title" class="padding-top-15 padding-bottom-15">
<div class="row"> <div class="row">
<div class="col-sm-7"> <div class="col-sm-7">
<h1 class="mainTitle" translate="dashboard.WELCOME" translate-values="{ appName: app.name }">{{ mainTitle }}</h1> <h1 class="mainTitle" translate="dashboard.WELCOME" translate-values="{ appName: app.name }">{{ mainTitle }}</h1>
<span class="mainDescription"></span> <span class="mainDescription"></span>
</div> </div>
</div> </div>
</section> </section> -->
<!-- end: DASHBOARD TITLE --> <!-- end: DASHBOARD TITLE -->
<!-- start: FEATURED BOX LINKS --> <!-- start: FEATURED BOX LINKS -->
<div class="container-fluid container-fullw bg-white" ng-controller="dashboardCtrl"> <div class="container-fluid container-fullw bg-white" ng-controller="dashboardCtrl">
<div class="row" data-ng-init="initCallTracking()"> <div class="row" data-ng-init="initCallTracking()">
<div class="row"> <div class="row">
<div class="col-sm-6"> <div class="col-sm-6">
<div class="container">
<div class="row">
<div class="panel panel-white" id="panel1"> <div class="panel panel-white" id="panel1">
<div class="panel-heading panel-white"> <div class="panel-heading panel-white">
<h4 class="panel-title text-green">Today Follow Up Details</h4> <h4 class="panel-title text-green">Follow Ups For Today : {{todayFolloupDetails.length}}</h4>
<ct-paneltool class="panel-tools" tool-refresh="load1" ng-click="initCallTracking()"></ct-paneltool> <ct-paneltool class="panel-tools" tool-refresh="load1" ng-click="initCallTracking()"></ct-paneltool>
</div> </div>
<div class="panel-body"> <div class="panel-body">
@ -32,11 +35,11 @@
<div class="panel-scroll height-180" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true" ng-if="emptyDataToday==false"> <div class="panel-scroll height-180" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true" ng-if="emptyDataToday==false">
<table class="table table-hover" ng-controller="studentModalDemoCtrl"> <table class="table table-hover" ng-controller="studentModalDemoCtrl">
<thead> <thead>
<tr><td colspan="5" style="background:#1FBBA6;color:#fff !important">Total Entries :{{todayFolloupDetails.length}}</td></tr> <tr><!--<td colspan="5" style="background:#1FBBA6;color:#fff !important">Total Entries :{{todayFolloupDetails.length}}</td></tr>-->
<tr> <tr>
<th>Tracking ID</th> <th> ID</th>
<th>Lead Name</th> <th> Name</th>
<th>Mobile No</th> <th>Mobile </th>
<th>Activity</th> <th>Activity</th>
<th>Status</th> <th>Status</th>
@ -61,11 +64,58 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="row">
<div class="panel panel-white" id="panel3">
<div class="panel-heading panel-white">
<h4 class="panel-title text-purple"> Leads Created Today :{{leadDetails.length}}</h4>
<ct-paneltool class="panel-tools" tool-refresh="load1" ng-click="initCallTracking()"></ct-paneltool>
</div>
<div class="panel-body">
<div ng-if="emptyDataLead==true">
<center>
<h5 class="text-dark">No Lead Created By Today!</h5>
</center>
</div>
<div class="panel-scroll height-180" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true" ng-if="emptyDataLead==false">
<table class="table table-hover" ng-controller="studentModalDemoCtrl">
<thead>
<!-- <tr><td colspan="6" style="background:#DD5A82;color:#fff !important">Total Entries :{{leadDetails.length}}</td></tr> -->
<tr>
<th> ID</th>
<th> Name</th>
<th>Mobile </th>
<th>Activity</th>
<th>Followup </th>
<th>Status</th>
</tr>
</thead>
<tbody ng-repeat="lead in leadDetails">
<tr>
<td>{{lead.TrackingID}}</td>
<td><a tooltip="View Student" class="text-dark" ng-click="open(lead);">{{lead.LeadName}}</a></td>
<td><a tooltip="View Student" class="text-dark" ng-click="open(lead);">{{lead.MobileNumber}}</a></td>
<td>{{lead.ActivityName}}</td>
<td>{{lead.FollowupOn}}</td>
<td class="hidden-xs" ng-if="lead.statusName=='CLOSE'"><span class="label label-sm label-info">{{lead.statusName}}</span></td>
<td class="hidden-xs" ng-if="lead.statusName!='CLOSE'"><span class="label label-sm label-info">{{lead.statusName}}</span></td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<div class="panel panel-white" id="panel2"> <div class="panel panel-white" id="panel2">
<div class="panel-heading panel-white"> <div class="panel-heading panel-white">
<h4 class="panel-title text-red">Pending Follow Up Details</h4> <h4 class="panel-title text-red">Pending Follow Ups :{{pendingFolloupDetails.length}}</h4>
<ct-paneltool class="panel-tools" tool-refresh="load1" ng-click="initCallTracking()"></ct-paneltool> <ct-paneltool class="panel-tools" tool-refresh="load1" ng-click="initCallTracking()"></ct-paneltool>
</div> </div>
<div class="panel-body"> <div class="panel-body">
@ -74,16 +124,17 @@
<h5 class="text-dark">No Pending Followup!</h5> <h5 class="text-dark">No Pending Followup!</h5>
</center> </center>
</div> </div>
<div class="panel-scroll height-180" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true" ng-if="emptyDataPending==false"> <div class="panel-scroll height-460" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true" ng-if="emptyDataPending==false">
<table class="table table-hover" ng-controller="studentModalDemoCtrl"> <table class="table table-hover" ng-controller="studentModalDemoCtrl">
<thead> <thead>
<tr><td colspan="6" style="background:#C82E29;color:#fff !important">Total Entries :{{pendingFolloupDetails.length}}</td></tr> <!-- <tr> -->
<!-- <td colspan="6" style="background:#C82E29;color:#fff !important">Total Entries :{{pendingFolloupDetails.length}}</td></tr> -->
<tr> <tr>
<th>Tracking ID</th> <th> ID</th>
<th>Lead Name</th> <th> Name</th>
<th>Mobile No</th> <th>Mobile </th>
<th>Activity</th> <th>Activity</th>
<th>Followup On</th> <th>Followup </th>
<th>Status</th> <th>Status</th>
</tr> </tr>
@ -108,10 +159,10 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-sm-6"> <!-- <div class="col-sm-6">
<div class="panel panel-white" id="panel3"> <div class="panel panel-white" id="panel3">
<div class="panel-heading panel-white"> <div class="panel-heading panel-white">
<h4 class="panel-title text-purple">Today Created Lead Details</h4> <h4 class="panel-title text-purple"> Leads Created Today :{{leadDetails.length}}</h4>
<ct-paneltool class="panel-tools" tool-refresh="load1" ng-click="initCallTracking()"></ct-paneltool> <ct-paneltool class="panel-tools" tool-refresh="load1" ng-click="initCallTracking()"></ct-paneltool>
</div> </div>
<div class="panel-body"> <div class="panel-body">
@ -123,13 +174,12 @@
<div class="panel-scroll height-180" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true" ng-if="emptyDataLead==false"> <div class="panel-scroll height-180" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true" ng-if="emptyDataLead==false">
<table class="table table-hover" ng-controller="studentModalDemoCtrl"> <table class="table table-hover" ng-controller="studentModalDemoCtrl">
<thead> <thead>
<tr><td colspan="6" style="background:#DD5A82;color:#fff !important">Total Entries :{{leadDetails.length}}</td></tr> <tr>
<tr> <th> ID</th>
<th>Tracking ID</th> <th> Name</th>
<th>Lead Name</th> <th>Mobile </th>
<th>Mobile No</th>
<th>Activity</th> <th>Activity</th>
<th>Followup On</th> <th>Followup </th>
<th>Status</th> <th>Status</th>
</tr> </tr>
@ -151,46 +201,24 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div> -->
<div class="col-sm-6"> <!-- <div class="col-sm-6">
<div class="panel panel-white no-radius"> <div class="panel panel-white no-radius">
<div class="panel-heading border-bottom"> <div class="panel-heading border-bottom">
<h4 class="panel-title">New Users</h4> <h4 class="panel-title">New Users</h4>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<!-- /// controller: 'OnotherCtrl' - localtion: assets/js/controllers/dashboardCtrl.js /// -->
<div ng-controller="OnotherCtrl"> <div ng-controller="OnotherCtrl">
<div class="text-center" data-ng-init="init()"> <div class="text-center" data-ng-init="init()">
<span class="mini-pie"> <canvas class="tc-chart" tc-chartjs-doughnut chart-options="options" chart-data="data" chart-legend="chart3" width="100"></canvas> <span>{{total}}</span> </span> <span class="mini-pie"> <canvas class="tc-chart" tc-chartjs-doughnut chart-options="options" chart-data="data" chart-legend="chart3" width="100"></canvas> <span>{{total}}</span> </span>
<!--<span class="inline text-large no-wrap">Acquisition</span>-->
</div> </div>
<div class="margin-top-20 text-center legend-xs"> <div class="margin-top-20 text-center legend-xs">
<div tc-chartjs-legend chart-legend="chart3" class="inline"></div> <div tc-chartjs-legend chart-legend="chart3" class="inline"></div>
</div> </div>
</div> </div>
</div> </div>
<!--<div class="panel-footer">
<div class="clearfix padding-5 space5">
<div class="col-xs-4 text-center no-padding">
<div class="border-right border-dark">
<span class="text-bold block text-extra-large">90%</span>
<span class="text-light">Satisfied</span>
</div>
</div>
<div class="col-xs-4 text-center no-padding">
<div class="border-right border-dark">
<span class="text-bold block text-extra-large">2%</span>
<span class="text-light">Unsatisfied</span>
</div>
</div>
<div class="col-xs-4 text-center no-padding">
<span class="text-bold block text-extra-large">8%</span>
<span class="text-light">NA</span>
</div>
</div>
</div>-->
</div> </div>
</div> </div> -->
</div> </div>
</div> </div>
<div> <div>

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

@ -2,7 +2,7 @@
<section id="page-title"> <section id="page-title">
<div class="row"> <div class="row">
<div class="col-sm-8"> <div class="col-sm-8">
<h1 class="mainTitle" translate="sidebar.nav.daybook.MAIN">{{ mainTitle }}</h1> <h1 class="mainTitle" translate="Approve expense">{{ mainTitle }}</h1>
</div> </div>
<div ncy-breadcrumb></div> <div ncy-breadcrumb></div>
</div> </div>
@ -144,7 +144,7 @@
</div> </div>
</div> </div>
<div class="table-responsive"> <div class="table-responsive">
<table style="width: 1200px;" class="table table-hover" ng-if="dataLengthIncome > 0"> <table style="width: 100%;" class="table table-hover" ng-if="dataLengthIncome > 0">
<thead> <thead>
<tr> <tr>
@ -169,9 +169,7 @@
<th>Amount <th>Amount
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>--> <!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th> </th>
<th>Comments
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th>
<!--<th ng-click="sort('amount')">Status <!--<th ng-click="sort('amount')">Status
<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span> <span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
</th>--> </th>-->
@ -188,19 +186,19 @@
<td> <td>
<div id="containersPara"> <div id="containersPara">
<div id="wrapper"> <div id="wrapper">
{{p.PaidDescription}} {{p.PaidDescription}} / {{p.Description}}
</div> </div>
</div> </div>
</td> </td>
<td>{{p.TypeName}}</td> <td>{{p.TypeName}}</td>
<td>{{p.Amount}}</td> <td>{{p.Amount}}</td>
<td> <!-- <td>
<div id="containersPara"> <div id="containersPara">
<div id="wrapper"> <div id="wrapper">
{{p.Description}} {{p.Description}}
</div> </div>
</div> </div>
</td> </td> -->
<!--<td tooltip="{{p.Approval_Comments}}"><span ng-if="p.Status == 'Pending'" style="text-transform: uppercase; text-shadow: 1px 1px #286d5f; color: #55d4bb ">{{p.Status}}</span> <!--<td tooltip="{{p.Approval_Comments}}"><span ng-if="p.Status == 'Pending'" style="text-transform: uppercase; text-shadow: 1px 1px #286d5f; color: #55d4bb ">{{p.Status}}</span>
<span ng-if="p.Status == 'Approved'" style="text-transform: uppercase; text-shadow: 1px 1px #166307; color: #2be209 ">{{p.Status}}</span> <span ng-if="p.Status == 'Approved'" style="text-transform: uppercase; text-shadow: 1px 1px #166307; color: #2be209 ">{{p.Status}}</span>
<span ng-if="p.Status == 'Rejected'" style="text-transform: uppercase; text-shadow: 1px 1px rgb(167, 88, 15); color: rgba(236, 24, 24, 0.98823529);">{{p.Status}}</span> <span ng-if="p.Status == 'Rejected'" style="text-transform: uppercase; text-shadow: 1px 1px rgb(167, 88, 15); color: rgba(236, 24, 24, 0.98823529);">{{p.Status}}</span>
@ -239,7 +237,7 @@
</div> </div>
</div> </div>
<div class="table-responsive"> <div class="table-responsive">
<table style="width: 1200px;" class="table table-hover" ng-if="dataLengthExpense > 0"> <table style="width: 100%;" class="table table-hover" ng-if="dataLengthExpense > 0">
<thead> <thead>
<tr> <tr>
<th ng-if="dayBookApprovalAccess == '1'"> <th ng-if="dayBookApprovalAccess == '1'">
@ -267,9 +265,7 @@
<th>Amount <th>Amount
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>--> <!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th> </th>
<th>Comments
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th>
<th ng-click="sort('Status')">Status <th ng-click="sort('Status')">Status
<span class="glyphicon sort-icon" ng-show="sortKey=='Status'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span> <span class="glyphicon sort-icon" ng-show="sortKey=='Status'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
</th> </th>
@ -291,19 +287,19 @@
<td> <td>
<div id="containersPara"> <div id="containersPara">
<div id="wrapper"> <div id="wrapper">
{{p.PaidDescription}} {{p.PaidDescription}} / {{p.Description}}
</div> </div>
</div> </div>
</td> </td>
<td>{{p.TypeName}}</td> <td>{{p.TypeName}}</td>
<td>{{p.Amount}}</td> <td>{{p.Amount}}</td>
<td> <!-- <td>
<div id="containersPara"> <div id="containersPara">
<div id="wrapper"> <div id="wrapper">
{{p.Description}} {{p.Description}}
</div> </div>
</div> </div>
</td> </td> -->
<td tooltip="{{p.Approval_Comments}} BY {{p.Approved_by_name}}"><span ng-if="p.Status == 'Pending'" style="text-transform: uppercase; text-shadow: 1px 1px #286d5f; color: #55d4bb ">{{p.Status}}</span> <td tooltip="{{p.Approval_Comments}} BY {{p.Approved_by_name}}"><span ng-if="p.Status == 'Pending'" style="text-transform: uppercase; text-shadow: 1px 1px #286d5f; color: #55d4bb ">{{p.Status}}</span>
<span ng-if="p.Status == 'Approved'" style="text-transform: uppercase; text-shadow: 1px 1px #166307; color: #2be209 ">{{p.Status}}</span> <span ng-if="p.Status == 'Approved'" style="text-transform: uppercase; text-shadow: 1px 1px #166307; color: #2be209 ">{{p.Status}}</span>
<span ng-if="p.Status == 'Rejected'" style="text-transform: uppercase; text-shadow: 1px 1px rgb(167, 88, 15); color: rgba(236, 24, 24, 0.98823529);">{{p.Status}}</span> <span ng-if="p.Status == 'Rejected'" style="text-transform: uppercase; text-shadow: 1px 1px rgb(167, 88, 15); color: rgba(236, 24, 24, 0.98823529);">{{p.Status}}</span>
@ -358,7 +354,7 @@
<textarea type="text" placeholder="Enter Comments" tabindex="3" class="form-control" name="description" ng-model="myStatusModel.description" <textarea type="text" placeholder="Enter Comments" tabindex="3" class="form-control" name="description" ng-model="myStatusModel.description"
maxlength="100" /> maxlength="100" />
<span class="text-small block">Comments Should be Less than 100 Characters.</span> <span class="text-small block">Max 100 Characters.</span>
<span class="error text-small block" ng-if="Form.description.$dirty && Form.description.$error.pattern">Invalid Comments</span> <span class="error text-small block" ng-if="Form.description.$dirty && Form.description.$error.pattern">Invalid Comments</span>
</div> </div>
</div> </div>

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

@ -181,7 +181,7 @@
<textarea type="text" placeholder="Enter Description" tabindex="3" class="form-control" name="editdescription_paid" ng-model="myModel.description_paid" <textarea type="text" placeholder="Enter Description" tabindex="3" class="form-control" name="editdescription_paid" ng-model="myModel.description_paid"
maxlength="100" /> maxlength="100" />
<span class="text-small block" style="color: rgba(128, 128, 128, 0.64)">Description Should be Less than 100 Characters.</span> <span class="text-small block" style="color: rgba(128, 128, 128, 0.64)">Max 100 Characters.</span>
<span class="error text-small block" ng-if="Form.editdescription_paid.$dirty && Form.editdescription_paid.$error.pattern">Invalid Description</span> <span class="error text-small block" ng-if="Form.editdescription_paid.$dirty && Form.editdescription_paid.$error.pattern">Invalid Description</span>
</div> </div>
@ -218,7 +218,7 @@
<textarea type="text" placeholder="Enter Comments" tabindex="3" class="form-control" name="editComments" ng-model="myModel.description" <textarea type="text" placeholder="Enter Comments" tabindex="3" class="form-control" name="editComments" ng-model="myModel.description"
maxlength="100" /> maxlength="100" />
<span class="text-small block" style="color: rgba(128, 128, 128, 0.64)">Comments Should be Less than 100 Charactes.</span> <span class="text-small block" style="color: rgba(128, 128, 128, 0.64)">Max 100 Charactes.</span>
<span class="error text-small block" ng-if="Form.description.$dirty && Form.description.$error.pattern">Invalid Comments</span> <span class="error text-small block" ng-if="Form.description.$dirty && Form.description.$error.pattern">Invalid Comments</span>
</div> </div>
@ -311,7 +311,7 @@
<textarea type="text" placeholder="Enter Description" tabindex="3" class="form-control" name="description_paid" ng-model="myModelAdd.description_paid" <textarea type="text" placeholder="Enter Description" tabindex="3" class="form-control" name="description_paid" ng-model="myModelAdd.description_paid"
maxlength="100" /> maxlength="100" />
<span class="text-small block" style="color: rgba(128, 128, 128, 0.64)">Description Should be Less than 100 Characters.</span> <span class="text-small block" style="color: rgba(128, 128, 128, 0.64)">Max 100 Characters.</span>
<span class="error text-small block" ng-if="Form.description_paid.$dirty && Form.description_paid.$error.pattern">Invalid Description</span> <span class="error text-small block" ng-if="Form.description_paid.$dirty && Form.description_paid.$error.pattern">Invalid Description</span>
</div> </div>
@ -346,7 +346,7 @@
<textarea type="text" placeholder="Enter Comments" tabindex="3" class="form-control" name="addComments" ng-model="myModelAdd.description" <textarea type="text" placeholder="Enter Comments" tabindex="3" class="form-control" name="addComments" ng-model="myModelAdd.description"
maxlength="100" /> maxlength="100" />
<span class="text-small block" style="color: rgba(128, 128, 128, 0.64)">Comments Should be Less than 100 Characters.</span> <span class="text-small block" style="color: rgba(128, 128, 128, 0.64)">Max 100 Characters.</span>
<span class="error text-small block" ng-if="Form.addComments.$dirty && Form.addComments.$error.pattern">Invalid Comments</span> <span class="error text-small block" ng-if="Form.addComments.$dirty && Form.addComments.$error.pattern">Invalid Comments</span>
</div> </div>

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

@ -359,7 +359,7 @@
<textarea type="text" placeholder="Enter Comments" tabindex="3" class="form-control" name="description" ng-model="myStatusModel.description" <textarea type="text" placeholder="Enter Comments" tabindex="3" class="form-control" name="description" ng-model="myStatusModel.description"
maxlength="100" /> maxlength="100" />
<span class="text-small block">Comments Should be Less than 100 Characters.</span> <span class="text-small block">Max 100 Characters.</span>
<span class="error text-small block" ng-if="Form.description.$dirty && Form.description.$error.pattern">Invalid Comments</span> <span class="error text-small block" ng-if="Form.description.$dirty && Form.description.$error.pattern">Invalid Comments</span>
</div> </div>
</div> </div>

26
Apollo/assets/views/daybook/daybooksuperadmin.html
View File

@ -154,7 +154,7 @@
<div class="table-responsive"> <div class="table-responsive">
<table style="width: 1200px;" class="table table-hover" ng-if="dataLengthIncome > 0"> <table style="width: 100%;" class="table table-hover" ng-if="dataLengthIncome > 0">
<thead> <thead>
<tr> <tr>
<th ng-click="sort('BranchName')">Branch <th ng-click="sort('BranchName')">Branch
@ -182,9 +182,7 @@
<th>Amount <th>Amount
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>--> <!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th> </th>
<th>Description
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th>
<!--<th ng-click="sort('amount')">Status <!--<th ng-click="sort('amount')">Status
<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span> <span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
</th>--> </th>-->
@ -200,19 +198,19 @@
<td> <td>
<div id="containersPara"> <div id="containersPara">
<div id="wrapper"> <div id="wrapper">
{{p.PaidDescription}} {{p.PaidDescription}} / {{p.Description}}
</div> </div>
</div> </div>
</td> </td>
<td>{{p.TypeName}}</td> <td>{{p.TypeName}}</td>
<td>{{p.Amount}}</td> <td>{{p.Amount}}</td>
<td> <!-- <td>
<div id="containersPara"> <div id="containersPara">
<div id="wrapper"> <div id="wrapper">
{{p.Description}} {{p.Description}}
</div> </div>
</div> </div>
</td> </td> -->
<!--<td tooltip="{{p.Approval_Comments}}"><span ng-if="p.Status == 'Pending'" style="text-transform: uppercase; text-shadow: 1px 1px #286d5f; color: #55d4bb ">{{p.Status}}</span> <!--<td tooltip="{{p.Approval_Comments}}"><span ng-if="p.Status == 'Pending'" style="text-transform: uppercase; text-shadow: 1px 1px #286d5f; color: #55d4bb ">{{p.Status}}</span>
<span ng-if="p.Status == 'Approved'" style="text-transform: uppercase; text-shadow: 1px 1px #166307; color: #2be209 ">{{p.Status}}</span> <span ng-if="p.Status == 'Approved'" style="text-transform: uppercase; text-shadow: 1px 1px #166307; color: #2be209 ">{{p.Status}}</span>
<span ng-if="p.Status == 'Rejected'" style="text-transform: uppercase; text-shadow: 1px 1px rgb(167, 88, 15); color: rgba(236, 24, 24, 0.98823529);">{{p.Status}}</span> <span ng-if="p.Status == 'Rejected'" style="text-transform: uppercase; text-shadow: 1px 1px rgb(167, 88, 15); color: rgba(236, 24, 24, 0.98823529);">{{p.Status}}</span>
@ -258,7 +256,7 @@
</div> </div>
</div> </div>
<div class="table-responsive"> <div class="table-responsive">
<table style="width: 1200px;" class="table table-hover" ng-if="dataLengthExpense > 0"> <table style="width: 100%;" class="table table-hover" ng-if="dataLengthExpense > 0">
<thead> <thead>
<tr> <tr>
<th ng-click="sort('BranchName')">Branch <th ng-click="sort('BranchName')">Branch
@ -285,9 +283,7 @@
<th>Amount <th>Amount
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>--> <!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th> </th>
<th>Description
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th>
<th ng-click="sort('Status')">Status <th ng-click="sort('Status')">Status
<span class="glyphicon sort-icon" ng-show="sortKey=='Status'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span> <span class="glyphicon sort-icon" ng-show="sortKey=='Status'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
</th> </th>
@ -303,19 +299,19 @@
<td> <td>
<div id="containersPara"> <div id="containersPara">
<div id="wrapper"> <div id="wrapper">
{{p.PaidDescription}} {{p.PaidDescription}} / {{p.Description}}
</div> </div>
</div> </div>
</td> </td>
<td>{{p.TypeName}}</td> <td>{{p.TypeName}}</td>
<td>{{p.Amount}}</td> <td>{{p.Amount}}</td>
<td> <!-- <td>
<div id="containersPara"> <div id="containersPara">
<div id="wrapper"> <div id="wrapper">
{{p.Description}} {{p.Description}}
</div> </div>
</div> </div>
</td> </td> -->
<td tooltip="{{p.Approval_Comments}} BY {{p.Approved_by_name}}"><span ng-if="p.Status == 'Pending'" style="text-transform: uppercase; text-shadow: 1px 1px #286d5f; color: #55d4bb ">{{p.Status}}</span> <td tooltip="{{p.Approval_Comments}} BY {{p.Approved_by_name}}"><span ng-if="p.Status == 'Pending'" style="text-transform: uppercase; text-shadow: 1px 1px #286d5f; color: #55d4bb ">{{p.Status}}</span>
<span ng-if="p.Status == 'Approved'" style="text-transform: uppercase; text-shadow: 1px 1px #166307; color: #2be209 ">{{p.Status}}</span> <span ng-if="p.Status == 'Approved'" style="text-transform: uppercase; text-shadow: 1px 1px #166307; color: #2be209 ">{{p.Status}}</span>
<span ng-if="p.Status == 'Rejected'" style="text-transform: uppercase; text-shadow: 1px 1px rgb(167, 88, 15); color: rgba(236, 24, 24, 0.98823529);">{{p.Status}}</span> <span ng-if="p.Status == 'Rejected'" style="text-transform: uppercase; text-shadow: 1px 1px rgb(167, 88, 15); color: rgba(236, 24, 24, 0.98823529);">{{p.Status}}</span>
@ -370,7 +366,7 @@
<textarea type="text" placeholder="Enter Comments" tabindex="3" class="form-control" name="description" ng-model="myStatusModel.description" <textarea type="text" placeholder="Enter Comments" tabindex="3" class="form-control" name="description" ng-model="myStatusModel.description"
maxlength="100" /> maxlength="100" />
<span class="text-small block">Comments Should be Less than 100 Characters.</span> <span class="text-small block">Max 100 Characters.</span>
<span class="error text-small block" ng-if="Form.description.$dirty && Form.description.$error.pattern">Invalid Comments</span> <span class="error text-small block" ng-if="Form.description.$dirty && Form.description.$error.pattern">Invalid Comments</span>
</div> </div>
</div> </div>

2
Apollo/assets/views/editBranchDetails.html
View File

@ -57,7 +57,7 @@
ng-pattern="/^[-a-z0-9~!$%^&*_=+}{\'?]+(\.[-a-z0-9~!$%^&*_=+}{\'?]+)*@([a-z0-9_][-a-z0-9_]*(\.[-a-z0-9_]+)*\.(aero|arpa|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org|pro|travel|mobi|[a-z][a-z])|([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}))(:[0-9]{1,5})?$/i" ng-pattern="/^[-a-z0-9~!$%^&*_=+}{\'?]+(\.[-a-z0-9~!$%^&*_=+}{\'?]+)*@([a-z0-9_][-a-z0-9_]*(\.[-a-z0-9_]+)*\.(aero|arpa|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org|pro|travel|mobi|[a-z][a-z])|([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}))(:[0-9]{1,5})?$/i"
ng-model="p.EmailID" required> ng-model="p.EmailID" required>
<span class="error text-small block" <span class="error text-small block"
ng-if="Form.Email.$dirty && Form.primaryEmail.$invalid" ng-if="Form.Email.$dirty && Form.Email.$invalid"
ng-hide="Form.Email.$error.email">Email is required.</span> ng-hide="Form.Email.$error.email">Email is required.</span>
<span class="error text-small block" <span class="error text-small block"
ng-if="Form.Email.$error.email">Please, enter a valid email address.</span> ng-if="Form.Email.$error.email">Please, enter a valid email address.</span>

2
Apollo/assets/views/editCourseDetails.html
View File

@ -17,7 +17,7 @@
<input type="text" placeholder="Enter Course ID" <input type="text" placeholder="Enter Course ID"
tabindex="2" class="form-control" name="coursecode" tabindex="2" class="form-control" name="coursecode"
ng-model="p.CourseID" ng-pattern="/^[a-zA-Z0-9-]*$/" readonly required/> ng-model="p.CourseCode" ng-pattern="/^[a-zA-Z0-9-]*$/" required/>
<span class="error text-small block" <span class="error text-small block"
ng-if="Form.coursecode.$dirty && Form.coursecode.$error.required">Course id is required</span> ng-if="Form.coursecode.$dirty && Form.coursecode.$error.required">Course id is required</span>
<span class="error text-small block" <span class="error text-small block"

127
Apollo/assets/views/editEmployeeDetails.html
View File

@ -207,15 +207,26 @@
ng-pattern="/^[a-zA-Z0-9.\s]*$/" /> ng-pattern="/^[a-zA-Z0-9.\s]*$/" />
<span class="error text-small block" ng-if="Form.mothername.$dirty && Form.mothername.$error.pattern">Invalid Last Name </span> <span class="error text-small block" ng-if="Form.mothername.$dirty && Form.mothername.$error.pattern">Invalid Last Name </span>
</div> </div>
<div class=" col-md-4 form-group" ng-class="{'has-error':Form.emailId.$dirty && Form.emailId.$invalid, 'has-success':Form.emailId.$valid}">
<label> <div data-ng-controller="DatepickerDemoCtrl">
Email ID <span class="symbol required"></span> <div class="col-md-4 form-group" ng-class="{'has-error':Form.dateofbirth.$dirty && Form.dateofbirth.$invalid, 'has-success':Form.dateofbirth.$valid}">
</label>
<input type="email" tabindex="6" placeholder="Enter Email ID" class="form-control" name="emailId" ng-pattern="/^[-a-z0-9~!$%^&*_=+}{\'?]+(\.[-a-z0-9~!$%^&*_=+}{\'?]+)*@([a-z0-9_][-a-z0-9_]*(\.[-a-z0-9_]+)*\.(aero|arpa|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org|pro|travel|mobi|[a-z][a-z])|([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}))(:[0-9]{1,5})?$/i"
ng-model="myModelEdit.EmailID" ng-blur='updateCheckEmailExist(myModelEdit)' required> <label>
<span class="error text-small block" ng-if="Form.emailId.$dirty && Form.primaryEmail.$invalid" ng-hide="Form.emailId.$error.email">Email is required.</span> Date Of Birth <span
<span class="error text-small block" ng-if="Form.emailId.$error.email">Please, enter a valid email address.</span> class="symbol required"></span>
</div> </label>
<input type="text" tabindex="6" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="myModelEdit.DOB"
is-open="startOpen" ng-init="startOpen = false" name="dateofbirth" datepicker-options="dateOptions"
placeholder="Select Date of Birth" close-text="Close" required="required" ng-change="getMaxEndDate(myModel.startDate)"
max-date="currentDate" />
<span class="error text-small block" ng-if="Form.dateofbirth.$dirty && Form.dateofbirth.$invalid" ng-hide="Form.dateofbirth.$error.maxlength">Date of Birth is required.</span>
<span class="error text-small block" ng-if="Form.dateofbirth.$error.maxlength">Enter a Valid Date of Birth</span>
</div>
</div>
</div> </div>
<div class="row"> <div class="row">
@ -238,26 +249,15 @@
ng-minlength="10" ng-maxlength="12" ng-pattern="/^[0-9]*$/" /> ng-minlength="10" ng-maxlength="12" ng-pattern="/^[0-9]*$/" />
<span class="error text-small block" ng-if="Form.secondaryPhone.$error.maxlength || Form.secondaryPhone.$error.minlength || Form.secondaryPhone.$error.pattern">Enter a Valid Phone Number</span> <span class="error text-small block" ng-if="Form.secondaryPhone.$error.maxlength || Form.secondaryPhone.$error.minlength || Form.secondaryPhone.$error.pattern">Enter a Valid Phone Number</span>
</div> </div>
<div class=" col-md-4 form-group" ng-class="{'has-error':Form.emailId.$dirty && Form.emailId.$invalid, 'has-success':Form.emailId.$valid}">
<div data-ng-controller="DatepickerDemoCtrl">
<div class="col-md-4 form-group" ng-class="{'has-error':Form.dateofbirth.$dirty && Form.dateofbirth.$invalid, 'has-success':Form.dateofbirth.$valid}">
<label> <label>
Date Of Birth <span Email ID <span class="symbol required"></span>
class="symbol required"></span> </label>
</label> <input type="email" tabindex="9" placeholder="Enter Email ID" class="form-control" name="emailId" ng-pattern="/^[-a-z0-9~!$%^&*_=+}{\'?]+(\.[-a-z0-9~!$%^&*_=+}{\'?]+)*@([a-z0-9_][-a-z0-9_]*(\.[-a-z0-9_]+)*\.(aero|arpa|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org|pro|travel|mobi|[a-z][a-z])|([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}))(:[0-9]{1,5})?$/i"
ng-model="myModelEdit.EmailID" ng-blur='updateCheckEmailExist(myModelEdit)' required>
<input type="text" tabindex="9" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="myModelEdit.DOB" <span class="error text-small block" ng-if="Form.emailId.$dirty && Form.emailId.$invalid" ng-hide="Form.emailId.$error.email">Email is required.</span>
is-open="startOpen" ng-init="startOpen = false" name="dateofbirth" datepicker-options="dateOptions" <span class="error text-small block" ng-if="Form.emailId.$error.email">Please, enter a valid email address.</span>
placeholder="Select Date of Birth" close-text="Close" required="required" ng-change="getMaxEndDate(myModel.startDate)"
max-date="currentDate" />
<span class="error text-small block" ng-if="Form.dateofbirth.$dirty && Form.dateofbirth.$invalid" ng-hide="Form.dateofbirth.$error.maxlength">Date of Birth is required.</span>
<span class="error text-small block" ng-if="Form.dateofbirth.$error.maxlength">Enter a Valid Date of Birth</span>
</div> </div>
</div>
</div> </div>
<div class="row"> <div class="row">
@ -283,32 +283,33 @@
Qualification Qualification
</label> </label>
<input type="text" placeholder="Enter Qualification" tabindex="11" class="form-control" name="qualificaion" ng-model="myModelEdit.Qualification" <input type="text" placeholder="Enter Qualification" tabindex="10" class="form-control" name="qualificaion" ng-model="myModelEdit.Qualification"
ng-pattern="/^[a-zA-Z.\s]*$/" /> ng-pattern="/^[a-zA-Z.\s]*$/" />
<span class="error text-small block" ng-if="Form.qualificaion.$dirty && Form.qualificaion.$error.pattern">Enter a Valid Qualification</span> <span class="error text-small block" ng-if="Form.qualificaion.$dirty && Form.qualificaion.$error.pattern">Enter a Valid Qualification</span>
</div> </div>
<div class="col-md-4 form-group" ng-class="{'has-error':Form.aadharNumber.$dirty && Form.aadharNumber.$invalid, 'has-success':Form.aadharNumber.$valid}">
<label>
Aadhar Number <span class="symbol required"></span>
</label>
<!--<input type="text" class="form-control" name="masked" placeholder="99/99/9999" ui-mask="99/99/9999" ng-model="x">-->
<input type="text" name="aadharNumber" tabindex="12" placeholder="____-____-____" ui-mask="9999-9999-9999" class="form-control"
ng-model="myModelEdit.AadharNumber" ng-minlength="10" ng-maxlength="15" ng-pattern="/^[0-9]*$/" required>
<span class="error text-small block" ng-if="Form.aadharNumber.$dirty && Form.aadharNumber.$invalid" ng-hide="Form.aadharNumber.$error.maxlength || Form.aadharNumber.$error.minlength || Form.aadharNumber.$error.pattern">Aadhar Number is required.</span>
<span class="error text-small block" ng-if="Form.aadharNumber.$error.maxlength || Form.aadharNumber.$error.minlength || Form.aadharNumber.$error.pattern">Enter a Valid Aadhar Number</span>
</div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-4 form-group" ng-class="{'has-error':Form.aadharNumber.$dirty && Form.aadharNumber.$invalid, 'has-success':Form.aadharNumber.$valid}">
<label>
Aadhar Number <span class="symbol required"></span>
</label>
<!--<input type="text" class="form-control" name="masked" placeholder="99/99/9999" ui-mask="99/99/9999" ng-model="x">-->
<input type="text" name="aadharNumber" tabindex="11" placeholder="____-____-____" ui-mask="9999-9999-9999" class="form-control"
ng-model="myModelEdit.AadharNumber" ng-minlength="10" ng-maxlength="15" ng-pattern="/^[0-9]*$/" required>
<span class="error text-small block" ng-if="Form.aadharNumber.$dirty && Form.aadharNumber.$invalid" ng-hide="Form.aadharNumber.$error.maxlength || Form.aadharNumber.$error.minlength || Form.aadharNumber.$error.pattern">Aadhar Number is required.</span>
<span class="error text-small block" ng-if="Form.aadharNumber.$error.maxlength || Form.aadharNumber.$error.minlength || Form.aadharNumber.$error.pattern">Enter a Valid Aadhar Number</span>
</div>
<div class="col-md-4 form-group"> <div class="col-md-4 form-group">
<div class="row"> <div class="row">
<div class="col-md-6 form-group" ng-class="{'has-error':Form.otherId.$dirty && Form.otherId.$invalid}"> <div class="col-md-6 form-group" ng-class="{'has-error':Form.otherId.$dirty && Form.otherId.$invalid}">
<label> <label>
Other ID Other ID
</label> </label>
<input type="text" name="otherId" tabindex="13" placeholder="Other Id" class="form-control" ng-model="myModelEdit.OtherID" ng-minlength="1" <input type="text" name="otherId" tabindex="12" placeholder="Other Id" class="form-control" ng-model="myModelEdit.OtherID" ng-minlength="1"
ng-maxlength="20" ng-pattern="/^[a-zA-Z0-9 ._-]+$/"> ng-maxlength="20" ng-pattern="/^[a-zA-Z0-9 ._-]+$/">
<span class="error text-small block" ng-if="Form.otherId.$dirty && Form.otherId.$invalid" ng-hide="Form.otherId.$error.maxlength || Form.otherId.$error.minlength || Form.otherId.$error.pattern">Aadhar Number is required.</span> <span class="error text-small block" ng-if="Form.otherId.$dirty && Form.otherId.$invalid" ng-hide="Form.otherId.$error.maxlength || Form.otherId.$error.minlength || Form.otherId.$error.pattern">Aadhar Number is required.</span>
<span class="error text-small block" ng-if="Form.otherId.$error.maxlength || Form.otherId.$error.minlength || Form.otherId.$error.pattern">Enter a Valid Details</span> <span class="error text-small block" ng-if="Form.otherId.$error.maxlength || Form.otherId.$error.minlength || Form.otherId.$error.pattern">Enter a Valid Details</span>
@ -317,28 +318,32 @@
<label> <label>
Other ID Details Other ID Details
</label> </label>
<input type="text" name="otherIdDetails" tabindex="14" placeholder="Other Id Details" class="form-control" ng-model="myModelEdit.OtherIDDetails" <input type="text" name="otherIdDetails" tabindex="13" placeholder="Other Id Details" class="form-control" ng-model="myModelEdit.OtherIDDetails"
ng-minlength="1" ng-maxlength="20" ng-pattern="/^[a-zA-Z0-9 ._-]+$/"> ng-minlength="1" ng-maxlength="20" ng-pattern="/^[a-zA-Z0-9 ._-]+$/">
<span class="error text-small block" ng-if="Form.otherIdDetails.$dirty && Form.otherIdDetails.$invalid" ng-hide="Form.otherIdDetails.$error.maxlength || Form.otherIdDetails.$error.minlength || Form.otherIdDetails.$error.pattern">Aadhar Number is required.</span> <span class="error text-small block" ng-if="Form.otherIdDetails.$dirty && Form.otherIdDetails.$invalid" ng-hide="Form.otherIdDetails.$error.maxlength || Form.otherIdDetails.$error.minlength || Form.otherIdDetails.$error.pattern">Aadhar Number is required.</span>
<span class="error text-small block" ng-if="Form.otherIdDetails.$error.maxlength || Form.otherIdDetails.$error.minlength || Form.otherIdDetails.$error.pattern">Enter a Valid Details</span> <span class="error text-small block" ng-if="Form.otherIdDetails.$error.maxlength || Form.otherIdDetails.$error.minlength || Form.otherIdDetails.$error.pattern">Enter a Valid Details</span>
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-4 form-group" ng-class="{'has-error':Form.address1.$dirty && Form.address1.$invalid}">
<label>
Permanent Address
</label>
<textarea placeholder="Enter Permanent Address" tabindex="15" class="form-control textdsc" name="address1" ng-model="myModelEdit.PermanentAddress"></textarea>
<span class="error text-small block" ng-if="Form.address1.$dirty && Form.address1.$invalid">Permanent Address is required</span>
</div>
<div class="col-md-4 form-group" ng-class="{'has-error':Form.address2.$dirty && Form.address2.$invalid}">
<label>
Current Address
</label>
<textarea placeholder="Enter Current Address" tabindex="16" class="form-control textdsc" name="address2" ng-model="myModelEdit.PresentAddress"></textarea>
<span class="error text-small block" ng-if="Form.address2.$dirty && Form.address2.$invalid">Current Address is required</span>
</div>
</div> </div>
<div class="row">
<div class="col-md-4 form-group" ng-class="{'has-error':Form.address1.$dirty && Form.address1.$invalid}">
<label>
Permanent Address
</label>
<textarea placeholder="Enter Permanent Address" tabindex="14" class="form-control textdsc" name="address1" ng-model="myModelEdit.PermanentAddress"></textarea>
<span class="error text-small block" ng-if="Form.address1.$dirty && Form.address1.$invalid">Permanent Address is required</span>
</div>
<div class="col-md-4 form-group" ng-class="{'has-error':Form.address2.$dirty && Form.address2.$invalid}">
<label>
Current Address
</label>
<textarea placeholder="Enter Current Address" tabindex="15" class="form-control textdsc" name="address2" ng-model="myModelEdit.PresentAddress"></textarea>
<span class="error text-small block" ng-if="Form.address2.$dirty && Form.address2.$invalid">Current Address is required</span>
</div>
</div>
<div class="row"> <div class="row">
<div data-ng-controller="DatepickerDemoCtrl"> <div data-ng-controller="DatepickerDemoCtrl">
<div class="col-md-4 form-group" ng-class="{'has-error':Form.dateofjoining.$dirty && Form.dateofjoining.$invalid, 'has-success':Form.dateofjoining.$valid}"> <div class="col-md-4 form-group" ng-class="{'has-error':Form.dateofjoining.$dirty && Form.dateofjoining.$invalid, 'has-success':Form.dateofjoining.$valid}">
@ -346,7 +351,7 @@
Date Of Joining <span class="symbol required"></span> Date Of Joining <span class="symbol required"></span>
</label> </label>
<input type="text" tabindex="17" class="form-control" ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="myModelEdit.DOJ" <input type="text" tabindex="16" class="form-control" ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="myModelEdit.DOJ"
is-open="startOpen" ng-init="startOpen = false" name="dateofjoining" datepicker-options="dateOptions" is-open="startOpen" ng-init="startOpen = false" name="dateofjoining" datepicker-options="dateOptions"
placeholder="Select Date of Birth" close-text="Close" required="required" ng-change="getMaxEndDate(myModel.startDate)" placeholder="Select Date of Birth" close-text="Close" required="required" ng-change="getMaxEndDate(myModel.startDate)"
/> />
@ -355,14 +360,14 @@
is-open="startOpen" ng-init="startOpen = false" name="dateofjoining" datepicker-options="dateOptions" is-open="startOpen" ng-init="startOpen = false" name="dateofjoining" datepicker-options="dateOptions"
placeholder="Select Date of Joining" close-text="Close" required="required" placeholder="Select Date of Joining" close-text="Close" required="required"
/>--> />-->
<span class="error text-small block" ng-if="Form.dateofjoining.$dirty && Form.dateofjoining.$error.required">Date of Joining required</span> <span class="error text-small block" ng-if="Form.dateofjoining.$dirty && Form.dateofjoining.$error.required">Date of Joining is required</span>
</div> </div>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-md-2">
<label> <label>
Active/De-Active Active/De-Active
</label> </label>
@ -387,7 +392,7 @@
<switch ng-model="p.IsActive" ng-init="p.IsActive = true" class="green"></switch> <switch ng-model="p.IsActive" ng-init="p.IsActive = true" class="green"></switch>
</div>--> </div>-->
</div> </div>
<div class="col-md-2"> <div class="col-md-4">
<img class="thumb prof" ng-src="images/{{myModelEdit.ProfilePicPath}}" /> <img class="thumb prof" ng-src="images/{{myModelEdit.ProfilePicPath}}" />
<style> <style>
.thumb { .thumb {
@ -410,14 +415,14 @@
<div class="file-upload"> <div class="file-upload">
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-md-6">
<h5>Update Profile Picture</h5> <h5>Update Profile Picture</h5>
<div class=" margin-bottom-5"> <div class=" margin-bottom-5">
</div> </div>
<input type="file" accept="image/*" ng-init="resetImage()" file-upload onchange="angular.element(this).scope().imageUpload(event)" /> <input type="file" accept="image/*" ng-init="resetImage()" file-upload onchange="angular.element(this).scope().imageUpload(event)" />
</div> </div>
<div class="col-md-2"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">

25
Apollo/assets/views/editUniversityDetails.html
View File

@ -15,10 +15,19 @@
<input type="text" placeholder="University Id" tabindex="1" class="form-control" name="universityId" ng-model="p.UniversityID" <input type="text" placeholder="University Id" tabindex="1" class="form-control" name="universityId" ng-model="p.UniversityID"
ng-pattern="/^[a-zA-Z0-9.\s]*$/" ng-blur='checkEmpIdExist()' readonly required/> ng-pattern="/^[a-zA-Z0-9.\s]*$/" ng-blur='checkEmpIdExist()' readonly required/>
<span class="error text-small block" ng-if="Form.universityId.$dirty && Form.universityId.$error.required">university Id</span> <span class="error text-small block" ng-if="Form.universityId.$dirty && Form.universityId.$error.required">University Id is required</span>
<span class="error text-small block" ng-if="Form.universityId.$dirty && Form.universityId.$error.pattern">Invalid university Id </span> <span class="error text-small block" ng-if="Form.universityId.$dirty && Form.universityId.$error.pattern">Invalid university Id </span>
</div> </div>
<div class="col-md-4 form-group" ng-class="{'has-error':Form.UniversityName.$dirty && Form.UniversityName.$invalid, 'has-success':Form.UniversityName.$valid}">
<label>
University Name <span class="symbol required"></span>
</label>
<input type="text" placeholder="University Name" tabindex="3" class="form-control" name="UniversityName" ng-model="p.UniversityName"
required/>
<span class="error text-small block" ng-if="Form.UniversityName.$dirty && Form.UniversityName.$invalid">University Name is required </span>
</div>
<div class="col-md-4 form-group" ng-class="{'has-error':Form.UniversityShortName.$dirty && Form.UniversityShortName.$invalid, 'has-success':Form.UniversityShortName.$valid}"> <div class="col-md-4 form-group" ng-class="{'has-error':Form.UniversityShortName.$dirty && Form.UniversityShortName.$invalid, 'has-success':Form.UniversityShortName.$valid}">
<label> <label>
@ -27,18 +36,10 @@
<input type="text" placeholder="University Short Name" tabindex="2" class="form-control" name="UniversityShortName" ng-model="p.UniversityShortName" <input type="text" placeholder="University Short Name" tabindex="2" class="form-control" name="UniversityShortName" ng-model="p.UniversityShortName"
required/> required/>
<span class="error text-small block" ng-if="Form.UniversityShortName.$dirty && Form.UniversityShortName.$error.required">University Short Name required</span> <span class="error text-small block" ng-if="Form.UniversityShortName.$dirty && Form.UniversityShortName.$error.required">University Short Name is required</span>
<!--<span class="error text-small block" ng-if="Form.UniversityShortName.$dirty && Form.UniversityShortName.$error.pattern">Invalid University Short Name </span>--> <!--<span class="error text-small block" ng-if="Form.UniversityShortName.$dirty && Form.UniversityShortName.$error.pattern">Invalid University Short Name </span>-->
</div> </div>
<div class="col-md-4 form-group" ng-class="{'has-error':Form.UniversityName.$dirty && Form.UniversityName.$invalid, 'has-success':Form.UniversityName.$valid}">
<label>
University Name <span class="symbol required"></span>
</label>
<input type="text" placeholder="University Name" tabindex="3" class="form-control" name="UniversityName" ng-model="p.UniversityName"
required/>
<span class="error text-small block" ng-if="Form.UniversityName.$dirty && Form.UniversityName.$invalid">University Name required </span>
</div>
</div> </div>
@ -61,7 +62,7 @@
</label> </label>
<input type="email" tabindex="5" placeholder="Enter Email ID" class="form-control" name="emailId" ng-pattern="/^[-a-z0-9~!$%^&*_=+}{\'?]+(\.[-a-z0-9~!$%^&*_=+}{\'?]+)*@([a-z0-9_][-a-z0-9_]*(\.[-a-z0-9_]+)*\.(aero|arpa|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org|pro|travel|mobi|[a-z][a-z])|([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}))(:[0-9]{1,5})?$/i" <input type="email" tabindex="5" placeholder="Enter Email ID" class="form-control" name="emailId" ng-pattern="/^[-a-z0-9~!$%^&*_=+}{\'?]+(\.[-a-z0-9~!$%^&*_=+}{\'?]+)*@([a-z0-9_][-a-z0-9_]*(\.[-a-z0-9_]+)*\.(aero|arpa|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org|pro|travel|mobi|[a-z][a-z])|([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}))(:[0-9]{1,5})?$/i"
ng-model="p.EmailID" ng-blur='updateCheckEmailExist(p)' required> ng-model="p.EmailID" ng-blur='updateCheckEmailExist(p)' required>
<span class="error text-small block" ng-if="Form.emailId.$dirty && Form.primaryEmail.$invalid" ng-hide="Form.emailId.$error.email">Email is required.</span> <span class="error text-small block" ng-if="Form.emailId.$dirty && Form.emailId.$invalid" ng-hide="Form.emailId.$error.email">Email is required.</span>
<span class="error text-small block" ng-if="Form.emailId.$error.email">Please, enter a valid email address.</span> <span class="error text-small block" ng-if="Form.emailId.$error.email">Please, enter a valid email address.</span>
</div> </div>
<div class="col-md-4 form-group" ng-class="{'has-error':Form.Address.$dirty && Form.Address.$invalid, 'has-success':Form.Address.$valid}"> <div class="col-md-4 form-group" ng-class="{'has-error':Form.Address.$dirty && Form.Address.$invalid, 'has-success':Form.Address.$valid}">

107
Apollo/assets/views/employeeDetails.html
View File

@ -2,10 +2,10 @@
<section id="page-title"> <section id="page-title">
<div class="row"> <div class="row">
<div class="col-sm-8"> <div class="col-sm-8">
<h1 class="mainTitle" translate="View/Add Employee Details">{{ mainTitle }}</h1> <h1 class="mainTitle" translate="Employee">{{ mainTitle }}</h1>
<!--
<span class="mainDescription">Over a dozen reusable components built to provide popovers, media objects, navigation, tooltips and much more. </span> <span class="mainDescription">View/Add Employee Details. </span>
-->
</div> </div>
<div ncy-breadcrumb></div> <div ncy-breadcrumb></div>
</div> </div>
@ -92,7 +92,7 @@
<th ng-click="sort('Lastname')">Last Name <th ng-click="sort('Lastname')">Last Name
<span class="glyphicon sort-icon" ng-show="sortKey=='Lastname'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span> <span class="glyphicon sort-icon" ng-show="sortKey=='Lastname'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
</th> </th>
<th ng-click="sort('MobileNumber')">MobileNumber <th ng-click="sort('MobileNumber')">Mobile
<span class="glyphicon sort-icon" ng-show="sortKey=='MobileNumber'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span> <span class="glyphicon sort-icon" ng-show="sortKey=='MobileNumber'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
</th> </th>
<th ng-click="sort('EmailID')">Email ID <th ng-click="sort('EmailID')">Email ID
@ -110,11 +110,14 @@
<td>{{p.Lastname}}</td> <td>{{p.Lastname}}</td>
<td>{{p.MobileNumber}}</td> <td>{{p.MobileNumber}}</td>
<td>{{p.EmailID}}</td> <td>{{p.EmailID}}</td>
<td><span ng-if="p.IsActive == 1"> Active </span><span ng-if="p.IsActive == 0">De-Active</span></td> <td><span ng-if="p.IsActive == 1"> Active </span><span ng-if="p.IsActive == 0">In-Active</span></td>
<td style="text-align: center;"> <td style="text-align: center;">
<input type=button class="btn btn-info btn-xs" ladda="ldloading1.zoom_in" id="editRowBtn{{p.StaffID}}" value="Personal Details" <!-- <input type=button class="btn btn-info btn-xs" ladda="ldloading1.zoom_in" id="editRowBtn{{p.StaffID}}" value="Personal Details"
ng-click="setEditId(p.StaffID);getEditDetails(p);"> ng-click="setEditId(p.StaffID);getEditDetails(p);"> -->
<input type=button class="btn btn-blue btn-xs" id="editBranchRowBtn{{p.StaffID}}" value="Branch Details" ng-click="setEditBranchId(p.StaffID);"> <i class="ti-user" tooltip="Personal Details" ng-click="setEditId(p.StaffID);getEditDetails(p);"></i>
<i class="ti-map-alt" tooltip="Branch Details" ng-click="setEditBranchId(p.StaffID);"></i>
<!-- <input type=button class="btn btn-blue btn-xs" id="editBranchRowBtn{{p.StaffID}}" value="Branch Details" ng-click="setEditBranchId(p.StaffID);"> -->
</td> </td>
</tr> </tr>
<tr ng-show="editId === p.StaffID" ng-if="editId === p.StaffID"> <tr ng-show="editId === p.StaffID" ng-if="editId === p.StaffID">
@ -170,7 +173,7 @@
<input type="text" placeholder="Enter Employee Id" tabindex="1" class="form-control" name="employeeId" ng-model="myModel.employeeId" <input type="text" placeholder="Enter Employee Id" tabindex="1" class="form-control" name="employeeId" ng-model="myModel.employeeId"
ng-pattern="/^[a-zA-Z0-9.\s]*$/" ng-blur='checkEmpIdExist()' required/> ng-pattern="/^[a-zA-Z0-9.\s]*$/" ng-blur='checkEmpIdExist()' required/>
<span class="error text-small block" ng-if="Form.employeeId.$dirty && Form.employeeId.$error.required">Employee Id required</span> <span class="error text-small block" ng-if="Form.employeeId.$dirty && Form.employeeId.$error.required">Employee Id is required</span>
<span class="error text-small block" ng-if="Form.employeeId.$dirty && Form.employeeId.$error.pattern">Invalid Employee Id </span> <span class="error text-small block" ng-if="Form.employeeId.$dirty && Form.employeeId.$error.pattern">Invalid Employee Id </span>
</div> </div>
@ -182,7 +185,7 @@
<input type="text" placeholder="Enter First Name" tabindex="2" class="form-control" name="firstname" ng-model="myModel.firstname" <input type="text" placeholder="Enter First Name" tabindex="2" class="form-control" name="firstname" ng-model="myModel.firstname"
ng-pattern="/^[a-zA-Z0-9.\s]*$/" required/> ng-pattern="/^[a-zA-Z0-9.\s]*$/" required/>
<span class="error text-small block" ng-if="Form.firstname.$dirty && Form.firstname.$error.required">First Name required</span> <span class="error text-small block" ng-if="Form.firstname.$dirty && Form.firstname.$error.required">First Name is required</span>
<span class="error text-small block" ng-if="Form.firstname.$dirty && Form.firstname.$error.pattern">Invalid First Name </span> <span class="error text-small block" ng-if="Form.firstname.$dirty && Form.firstname.$error.pattern">Invalid First Name </span>
</div> </div>
@ -193,7 +196,7 @@
<input type="text" placeholder="Enter Last Name" tabindex="3" class="form-control" name="lastname" ng-model="myModel.lastname" <input type="text" placeholder="Enter Last Name" tabindex="3" class="form-control" name="lastname" ng-model="myModel.lastname"
ng-pattern="/^[a-zA-Z0-9.\s]*$/" required/> ng-pattern="/^[a-zA-Z0-9.\s]*$/" required/>
<span class="error text-small block" ng-if="Form.lastname.$dirty && Form.lastname.$error.required">Last Name required</span> <span class="error text-small block" ng-if="Form.lastname.$dirty && Form.lastname.$error.required">Last Name is required</span>
<span class="error text-small block" ng-if="Form.lastname.$dirty && Form.lastname.$error.pattern">Invalid Last Name </span> <span class="error text-small block" ng-if="Form.lastname.$dirty && Form.lastname.$error.pattern">Invalid Last Name </span>
</div> </div>
</div> </div>
@ -229,14 +232,25 @@
ng-pattern="/^[a-zA-Z0-9.\s]*$/" /> ng-pattern="/^[a-zA-Z0-9.\s]*$/" />
<span class="error text-small block" ng-if="Form.mothername.$dirty && Form.mothername.$error.pattern">Invalid Last Name </span> <span class="error text-small block" ng-if="Form.mothername.$dirty && Form.mothername.$error.pattern">Invalid Last Name </span>
</div> </div>
<div class=" col-md-4 form-group" ng-class="{'has-error':Form.emailId.$dirty && Form.emailId.$invalid, 'has-success':Form.emailId.$valid}">
<label> <div data-ng-controller="DatepickerDemoCtrl">
Email ID <span class="symbol required"></span>
<!--<pre>Selected date is: <em>{{myModel.dateofbirth}}</em></pre>-->
<div class="col-md-4 form-group" ng-class="{'has-error':Form.dateofbirth.$dirty && Form.dateofbirth.$invalid, 'has-success':Form.dateofbirth.$valid}">
<label>
Date Of Birth <span
class="symbol required"></span>
</label> </label>
<input type="email" tabindex="6" placeholder="Enter Email ID" class="form-control" name="emailId" ng-pattern="/^[-a-z0-9~!$%^&*_=+}{\'?]+(\.[-a-z0-9~!$%^&*_=+}{\'?]+)*@([a-z0-9_][-a-z0-9_]*(\.[-a-z0-9_]+)*\.(aero|arpa|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org|pro|travel|mobi|[a-z][a-z])|([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}))(:[0-9]{1,5})?$/i" <input type="text" tabindex="6" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="myModel.dateofbirth"
ng-model="myModel.emailId" ng-blur='checkEmailExist()' required> is-open="startOpen" ng-init="startOpen = true" name="dateofbirth" datepicker-options="dateOptions"
<span class="error text-small block" ng-if="Form.emailId.$dirty && Form.primaryEmail.$invalid" ng-hide="Form.emailId.$error.email">Email is required.</span> placeholder="Select Date of Birth" close-text="Close" required="required"
<span class="error text-small block" ng-if="Form.emailId.$error.email">Please, enter a valid email address.</span> ng-change="getMaxEndDate(myModel.startDate)" max-date="currentDate" />
<span class="error text-small block" ng-if="Form.dateofbirth.$dirty && Form.dateofbirth.$invalid" ng-hide="Form.dateofbirth.$error.maxlength">Date of Birth is required.</span>
<span class="error text-small block" ng-if="Form.dateofbirth.$error.maxlength">Enter a Valid Date of Birth</span>
</div>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
@ -265,19 +279,14 @@
<!--<pre>Selected date is: <em>{{myModel.dateofbirth}}</em></pre>--> <!--<pre>Selected date is: <em>{{myModel.dateofbirth}}</em></pre>-->
<div class="col-md-4 form-group" ng-class="{'has-error':Form.dateofbirth.$dirty && Form.dateofbirth.$invalid, 'has-success':Form.dateofbirth.$valid}"> <div class=" col-md-4 form-group" ng-class="{'has-error':Form.emailId.$dirty && Form.emailId.$invalid, 'has-success':Form.emailId.$valid}">
<label> <label>
Date Of Birth <span Email ID <span class="symbol required"></span>
class="symbol required"></span> </label>
</label> <input type="email" tabindex="9" placeholder="Enter Email ID" class="form-control" name="emailId" ng-pattern="/^[-a-z0-9~!$%^&*_=+}{\'?]+(\.[-a-z0-9~!$%^&*_=+}{\'?]+)*@([a-z0-9_][-a-z0-9_]*(\.[-a-z0-9_]+)*\.(aero|arpa|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org|pro|travel|mobi|[a-z][a-z])|([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}))(:[0-9]{1,5})?$/i"
<input type="text" tabindex="9" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="myModel.dateofbirth" ng-model="myModel.emailId" ng-blur='checkEmailExist()' required>
is-open="startOpen" ng-init="startOpen = true" name="dateofbirth" datepicker-options="dateOptions" <span class="error text-small block" ng-if="Form.emailId.$dirty && Form.emailId.$invalid" ng-hide="Form.emailId.$error.email">Email is required.</span>
placeholder="Select Date of Birth" close-text="Close" required="required" <span class="error text-small block" ng-if="Form.emailId.$error.email">Please, enter a valid email address.</span>
ng-change="getMaxEndDate(myModel.startDate)" max-date="currentDate" />
<span class="error text-small block" ng-if="Form.dateofbirth.$dirty && Form.dateofbirth.$invalid" ng-hide="Form.dateofbirth.$error.maxlength">Date of Birth is required.</span>
<span class="error text-small block" ng-if="Form.dateofbirth.$error.maxlength">Enter a Valid Date of Birth</span>
</div> </div>
</div> </div>
@ -310,21 +319,22 @@
<span class="error text-small block" ng-if="Form.qualificaion.$dirty && Form.qualificaion.$error.pattern">Enter a Valid Qualification</span> <span class="error text-small block" ng-if="Form.qualificaion.$dirty && Form.qualificaion.$error.pattern">Enter a Valid Qualification</span>
</div> </div>
<div class="col-md-4 form-group" ng-class="{'has-error':Form.aadharNumber.$dirty && Form.aadharNumber.$invalid, 'has-success':Form.aadharNumber.$valid}">
<label>
Aadhar Number <span class="symbol required"></span>
</label>
<!--<input type="text" class="form-control" name="masked" placeholder="99/99/9999" ui-mask="99/99/9999" ng-model="x">-->
<input type="text" name="aadharNumber" tabindex="12" placeholder="____-____-____" ui-mask="9999-9999-9999" class="form-control"
ng-model="myModel.aadharNumber" ng-minlength="10" ng-maxlength="15" ng-pattern="/^[0-9]*$/"
required>
<span class="error text-small block" ng-if="Form.aadharNumber.$dirty && Form.aadharNumber.$invalid" ng-hide="Form.aadharNumber.$error.maxlength || Form.aadharNumber.$error.minlength || Form.aadharNumber.$error.pattern">Aadhar Number is required.</span>
<span class="error text-small block" ng-if="Form.aadharNumber.$error.maxlength || Form.aadharNumber.$error.minlength || Form.aadharNumber.$error.pattern">Enter a Valid Aadhar Number</span>
</div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-4 form-group" ng-class="{'has-error':Form.aadharNumber.$dirty && Form.aadharNumber.$invalid, 'has-success':Form.aadharNumber.$valid}">
<label>
Aadhar Number <span class="symbol required"></span>
</label>
<!--<input type="text" class="form-control" name="masked" placeholder="99/99/9999" ui-mask="99/99/9999" ng-model="x">-->
<input type="text" name="aadharNumber" tabindex="12" placeholder="____-____-____" ui-mask="9999-9999-9999" class="form-control"
ng-model="myModel.aadharNumber" ng-minlength="10" ng-maxlength="15" ng-pattern="/^[0-9]*$/"
required>
<span class="error text-small block" ng-if="Form.aadharNumber.$dirty && Form.aadharNumber.$invalid" ng-hide="Form.aadharNumber.$error.maxlength || Form.aadharNumber.$error.minlength || Form.aadharNumber.$error.pattern">Aadhar Number is required.</span>
<span class="error text-small block" ng-if="Form.aadharNumber.$error.maxlength || Form.aadharNumber.$error.minlength || Form.aadharNumber.$error.pattern">Enter a Valid Aadhar Number</span>
</div>
<div class="col-md-4 form-group"> <div class="col-md-4 form-group">
<div class="row"> <div class="row">
<div class="col-md-6 form-group" ng-class="{'has-error':Form.otherId.$dirty && Form.otherId.$invalid}"> <div class="col-md-6 form-group" ng-class="{'has-error':Form.otherId.$dirty && Form.otherId.$invalid}">
@ -347,6 +357,9 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="row">
<div class="col-md-4 form-group" ng-class="{'has-error':Form.address1.$dirty && Form.address1.$invalid}"> <div class="col-md-4 form-group" ng-class="{'has-error':Form.address1.$dirty && Form.address1.$invalid}">
<label> <label>
Permanent Address Permanent Address
@ -368,7 +381,7 @@
<div class="file-upload"> <div class="file-upload">
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-12">
<div class="form-group"> <div class="form-group">
@ -452,7 +465,7 @@
is-open="startOpen" ng-init="startOpen = false" name="dateofjoining" datepicker-options="dateOptions" is-open="startOpen" ng-init="startOpen = false" name="dateofjoining" datepicker-options="dateOptions"
placeholder="Select Date of Joining" close-text="Close" required="required" placeholder="Select Date of Joining" close-text="Close" required="required"
/> />
<span class="error text-small block" ng-if="Form.dateofjoining.$dirty && Form.dateofjoining.$error.required">Date of Joining required</span> <span class="error text-small block" ng-if="Form.dateofjoining.$dirty && Form.dateofjoining.$error.required">Date of Joining is required</span>
</div> </div>
</div> </div>
@ -470,12 +483,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 && myModel.finaceModuleAccess == true}"> <div class="col-md-4 form-group" ng-class="{'has-error':Form.financeModuleAccess.$dirty && Form.financeModuleAccess.$invalid, 'has-success':Form.financeModuleAccess.$valid && myModel.finaceModuleAccess == true}">
<label> <label>
Day Book Access <span ng-if="myModel.finaceModuleAccess" class="symbol"></span> Expense Access <span ng-if="myModel.finaceModuleAccess" 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="myModel.finaceModuleAccess"> <input type="checkbox" id="checkbox6" name="financeModuleAccess" ng-model="myModel.finaceModuleAccess">
<label for="checkbox6"> <label for="checkbox6">
Day Book Approval Access Expense 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>

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

@ -65,11 +65,11 @@
<td> {{userInfo.EmailID}}</td> <td> {{userInfo.EmailID}}</td>
</tr> </tr>
<tr> <tr>
<td>Father Name <span style="float: right;">:</span></td> <td>Father's Name <span style="float: right;">:</span></td>
<td> {{userInfo.Fathername}}</td> <td> {{userInfo.Fathername}}</td>
</tr> </tr>
<tr> <tr>
<td>Mother Name <span style="float: right;">:</span></td> <td>Mother's Name <span style="float: right;">:</span></td>
<td> {{userInfo.MotherName}}</td> <td> {{userInfo.MotherName}}</td>
</tr> </tr>
<tr> <tr>

73
Apollo/assets/views/partials/nav.html
View File

@ -15,6 +15,7 @@
</div> </div>
</a> </a>
</li> </li>
<li ng-class="{'active open':$state.includes('app.master')}"> <li ng-class="{'active open':$state.includes('app.master')}">
<a href="javascript:void(0)"> <a href="javascript:void(0)">
<div class="item-content"> <div class="item-content">
@ -27,32 +28,34 @@
</div> </div>
</a> </a>
<ul class="sub-menu"> <ul class="sub-menu">
<li ui-sref-active="active">
<a ui-sref="app.master.studentStatusUpdate">
<span class="title" translate="sidebar.nav.master.STUDENTSTATUS"> DEFAULT STUDENT ACTIVITY</span>
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.master.activity">
<span class="title" translate="sidebar.nav.master.ACTIVITY"> ACTIVITY DETAILS </span>
</a>
</li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.master.status"> <a ui-sref="app.master.status">
<span class="title" translate="sidebar.nav.master.STATUS"> STATUS DETAILS</span> <span class="title" translate="sidebar.nav.master.STATUS"> STATUS DETAILS</span>
</a> </a>
</li> </li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.master.studentStatusUpdate"> <a ui-sref="app.master.university">
<span class="title" translate="sidebar.nav.master.STUDENTSTATUS"> DEFAULT STUDENT ACTIVITY</span> <span class="title" translate="sidebar.nav.master.UNIVERSITY"> UNIVERSITY DETAILS </span>
</a> </a>
</li> </li>
<li ui-sref-active="active">
<a ui-sref="app.master.activity">
<span class="title" translate="sidebar.nav.master.ACTIVITY"> ACTIVITY DETAILS </span>
</a>
</li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.master.batch"> <a ui-sref="app.master.batch">
<span class="title" translate="sidebar.nav.master.BATCH"> BATCH DETAILS </span> <span class="title" translate="sidebar.nav.master.BATCH"> BATCH DETAILS </span>
</a> </a>
</li> </li>
<li ui-sref-active="active">
<a ui-sref="app.master.university">
<span class="title" translate="sidebar.nav.master.UNIVERSITY"> UNIVERSITY DETAILS </span>
</a>
</li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.master.course"> <a ui-sref="app.master.course">
<span class="title" translate="sidebar.nav.master.COURSE"> COURSE DETAILS </span> <span class="title" translate="sidebar.nav.master.COURSE"> COURSE DETAILS </span>
@ -68,11 +71,7 @@
<span class="title" translate="sidebar.nav.master.EMPLOYEE"> EMPLOYEE DETAILS </span> <span class="title" translate="sidebar.nav.master.EMPLOYEE"> EMPLOYEE DETAILS </span>
</a> </a>
</li> </li>
<li ui-sref-active="active">
<a ui-sref="app.master.announcement">
<span class="title" translate="sidebar.nav.master.ANNOUNCEMENT"> Announcement DETAILS </span>
</a>
</li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.master.dayBookMaster"> <a ui-sref="app.master.dayBookMaster">
<span class="title" translate="sidebar.nav.master.DAYBOOKMASTER"> DAY BOOK DETAILS </span> <span class="title" translate="sidebar.nav.master.DAYBOOKMASTER"> DAY BOOK DETAILS </span>
@ -83,6 +82,24 @@
</ul> </ul>
</li> </li>
<li ui-sref-active="active">
<a ui-sref="app.master.announcement">
<div class="item-content">
<div class="item-media">
<i class="ti-announcement"></i>
</div>
<div class="item-inner">
<span class="title" translate="sidebar.nav.master.ANNOUNCEMENT"> ANNOUNCEMENT DETAILS </span>
</div>
</div>
</a>
</li>
<!-- <li ui-sref-active="active">
<a ui-sref="app.master.announcement">
<span class="title" translate="sidebar.nav.master.ANNOUNCEMENT"> Announcement DETAILS </span>
</a>
</li> -->
<li ng-class="{'active open':$state.includes('app.student')}"> <li ng-class="{'active open':$state.includes('app.student')}">
<a href="javascript:void(0)"> <a href="javascript:void(0)">
<div class="item-content"> <div class="item-content">
@ -156,7 +173,7 @@
<a href="javascript:void(0)"> <a href="javascript:void(0)">
<div class="item-content"> <div class="item-content">
<div class="item-media"> <div class="item-media">
<i class="ti-layers-alt"></i> <i class="ti-headphone-alt"></i>
</div> </div>
<div class="item-inner"> <div class="item-inner">
<span class="title" translate="sidebar.nav.tracking.MAIN"> CAll TRACKING </span><i class="icon-arrow"></i> <span class="title" translate="sidebar.nav.tracking.MAIN"> CAll TRACKING </span><i class="icon-arrow"></i>
@ -196,7 +213,7 @@
<a ui-sref="app.daybooksuperadmin"> <a ui-sref="app.daybooksuperadmin">
<div class="item-content"> <div class="item-content">
<div class="item-media"> <div class="item-media">
<i class="ti-check-box"></i> <i class="ti-money"></i>
</div> </div>
<div class="item-inner"> <div class="item-inner">
<span class="title" translate="sidebar.nav.daybook.MAIN">DAY BOOK</span> <span class="title" translate="sidebar.nav.daybook.MAIN">DAY BOOK</span>
@ -208,7 +225,7 @@
<a href="javascript:void(0)"> <a href="javascript:void(0)">
<div class="item-content"> <div class="item-content">
<div class="item-media"> <div class="item-media">
<i class="ti-id-badge"></i> <i class="ti-comment-alt"></i>
</div> </div>
<div class="item-inner"> <div class="item-inner">
<span class="title" translate="sidebar.nav.sendSMSPage.MAIN">BROADCAST</span><i class="icon-arrow"></i> <span class="title" translate="sidebar.nav.sendSMSPage.MAIN">BROADCAST</span><i class="icon-arrow"></i>

4
Apollo/assets/views/status-update/answer_booklet_status.html
View File

@ -3,7 +3,7 @@
<div class="row"> <div class="row">
<div class="col-sm-8"> <div class="col-sm-8">
<h1 class="mainTitle" translate="sidebar.nav.student.status.ANSWERBOOKLET">{{ mainTitle }}</h1> <h1 class="mainTitle" translate="sidebar.nav.student.status.ANSWERBOOKLET">{{ mainTitle }}</h1>
<span class="mainDescription"></span> <span class="mainDescription">Update answer booklet status.</span>
</div> </div>
<div ncy-breadcrumb></div> <div ncy-breadcrumb></div>
</div> </div>
@ -130,7 +130,7 @@
<th ng-click="sort('Lastname')">Last Name <th ng-click="sort('Lastname')">Last Name
<span class="glyphicon sort-icon" ng-show="sortKey=='Lastname'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span> <span class="glyphicon sort-icon" ng-show="sortKey=='Lastname'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
</th> </th>
<th ng-click="sort('MobileNumber')">MobileNumber <th ng-click="sort('MobileNumber')">Mobile
<span class="glyphicon sort-icon" ng-show="sortKey=='MobileNumber'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span> <span class="glyphicon sort-icon" ng-show="sortKey=='MobileNumber'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
</th> </th>
<th ng-click="sort('EmailID')">Email ID <th ng-click="sort('EmailID')">Email ID

2
Apollo/assets/views/status-update/application_status.html
View File

@ -3,7 +3,7 @@
<div class="row"> <div class="row">
<div class="col-sm-8"> <div class="col-sm-8">
<h1 class="mainTitle" translate="sidebar.nav.student.status.APPLICATION">{{ mainTitle }}</h1> <h1 class="mainTitle" translate="sidebar.nav.student.status.APPLICATION">{{ mainTitle }}</h1>
<span class="mainDescription"></span> <span class="mainDescription">Update application status.</span>
</div> </div>
<div ncy-breadcrumb></div> <div ncy-breadcrumb></div>
</div> </div>

2
Apollo/assets/views/status-update/certification_status.html
View File

@ -3,7 +3,7 @@
<div class="row"> <div class="row">
<div class="col-sm-8"> <div class="col-sm-8">
<h1 class="mainTitle" translate="sidebar.nav.student.status.CERTIFICATION">{{ mainTitle }}</h1> <h1 class="mainTitle" translate="sidebar.nav.student.status.CERTIFICATION">{{ mainTitle }}</h1>
<span class="mainDescription"></span> <span class="mainDescription">Update certification status.</span>
</div> </div>
<div ncy-breadcrumb></div> <div ncy-breadcrumb></div>
</div> </div>

6
Apollo/assets/views/status-update/fees_status.html
View File

@ -26,9 +26,9 @@
<div class="col-sm-8"> <div class="col-sm-8">
<h1 class="mainTitle" translate="Student Fees Status">{{ mainTitle }}</h1> <h1 class="mainTitle" translate="Student Fees Status">{{ mainTitle }}</h1>
<!--
<span class="mainDescription">Over a dozen reusable components built to provide popovers, media objects, navigation, tooltips and much more. </span> <span class="mainDescription">Update fees status. </span>
-->
</div> </div>
<div ncy-breadcrumb></div> <div ncy-breadcrumb></div>
</div> </div>

2
Apollo/assets/views/status-update/study_material_status.html
View File

@ -3,7 +3,7 @@
<div class="row"> <div class="row">
<div class="col-sm-8"> <div class="col-sm-8">
<h1 class="mainTitle" translate="sidebar.nav.student.status.STUDYMATERIAL">{{ mainTitle }}</h1> <h1 class="mainTitle" translate="sidebar.nav.student.status.STUDYMATERIAL">{{ mainTitle }}</h1>
<span class="mainDescription"></span> <span class="mainDescription">Update study material status.</span>
</div> </div>
<div ncy-breadcrumb></div> <div ncy-breadcrumb></div>
</div> </div>

12
Apollo/assets/views/status.html
View File

@ -11,10 +11,10 @@
<section id="page-title"> <section id="page-title">
<div class="row"> <div class="row">
<div class="col-sm-8"> <div class="col-sm-8">
<h1 class="mainTitle" translate="Status Details"></h1> <h1 class="mainTitle" translate="Status"></h1>
<!--
<span class="mainDescription">Over a dozen reusable components built to provide popovers, media objects, navigation, tooltips and much more. </span> <span class="mainDescription">Manage various status for the entire application. </span>
-->
</div> </div>
<div ncy-breadcrumb></div> <div ncy-breadcrumb></div>
</div> </div>
@ -77,7 +77,7 @@
<div class="col-md-2" style="padding-top: 2.3%;"> <div class="col-md-2" style="padding-top: 2.3%;">
<div class="pull-right"> <div class="pull-right">
<button type="submit" ladda="ldloading1.zoom_in" tabindex="2" class="btn btn-wide btn-success" data-style="zoom-in"> <button type="submit" ladda="ldloading1.zoom_in" tabindex="2" class="btn btn-wide btn-success" data-style="zoom-in">
Submit Add
</button> </button>
<!-- <button type="submit" class="btn btn-success btn-o" tabindex="8"> <!-- <button type="submit" class="btn btn-success btn-o" tabindex="8">
Submit Submit
@ -132,7 +132,7 @@
<tr> <tr>
<td>{{p.ListCode}}</td> <td>{{p.ListCode}}</td>
<td>{{p.ListName}}</td> <td>{{p.ListName}}</td>
<td><span ng-if="p.IsActive == 1"> Active </span><span ng-if="p.IsActive == 0">De-Active</span></td> <td><span ng-if="p.IsActive == 1"> Active </span><span ng-if="p.IsActive == 0">In-Active</span></td>
<td> <td>
<a class="text-azure" id="editRowBtn{{p.ListCode}}" ng-click="setEditId(p.ListCode);"><b class="fa fa-hover fa-pencil " aria-hidden="true"></b> <a class="text-azure" id="editRowBtn{{p.ListCode}}" ng-click="setEditId(p.ListCode);"><b class="fa fa-hover fa-pencil " aria-hidden="true"></b>
</a> </a>

8
Apollo/assets/views/student/editStudentCourseDetails.html
View File

@ -124,7 +124,7 @@
</label> </label>
<input type="text" name="enrollmentid" tabindex="27" placeholder="Enter Entollment ID" class="form-control" ng-model="stucour.EnrollmentID" <input type="text" name="enrollmentid" tabindex="27" placeholder="Enter Entollment ID" class="form-control" ng-model="stucour.EnrollmentID"
/> />
<span class="error text-small block" ng-if="Form.enrollmentid.$dirty && Form.enrollmentid.$error.required">Enrollment ID required</span> <span class="error text-small block" ng-if="Form.enrollmentid.$dirty && Form.enrollmentid.$error.required">Enrollment ID is required</span>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
@ -144,7 +144,7 @@
Reason for Deactivating <span class="symbol required"></span> Reason for Deactivating <span class="symbol required"></span>
</label> </label>
<textarea maxlength="100" placeholder="Reason for Deactivating" tabindex="25" class="form-control textdsc" name="DeactiveComments" ng-model="stucour.DeactiveComments" required></textarea> <textarea maxlength="100" placeholder="Reason for Deactivating" tabindex="25" class="form-control textdsc" name="DeactiveComments" ng-model="stucour.DeactiveComments" required></textarea>
<span class="text-small block">Comments Should be Less than 100 Characters.</span> <span class="text-small block">Max 100 Characters.</span>
<span class="error text-small block" ng-if="Form.DeactiveComments.$dirty && Form.DeactiveComments.$invalid">De-Active Comments is required</span> <span class="error text-small block" ng-if="Form.DeactiveComments.$dirty && Form.DeactiveComments.$invalid">De-Active Comments is required</span>
</div> </div>
</div> </div>
@ -232,7 +232,7 @@
</label> </label>
<input type="text" name="enrollmentid" tabindex="27" placeholder="Enter Entollment ID" class="form-control" ng-model="myModelCourse.enrollmentid" <input type="text" name="enrollmentid" tabindex="27" placeholder="Enter Entollment ID" class="form-control" ng-model="myModelCourse.enrollmentid"
/> />
<span class="error text-small block" ng-if="FormAdd.enrollmentid.$dirty && FormAdd.enrollmentid.$error.required">Enrollment ID required</span> <span class="error text-small block" ng-if="FormAdd.enrollmentid.$dirty && FormAdd.enrollmentid.$error.required">Enrollment ID is required</span>
</div> </div>
<div class="col-md-4 form-group" ng-class="{'has-error':FormAdd.dateofjoining.$dirty && FormAdd.dateofjoining.$invalid, 'has-success':FormAdd.dateofjoining.$valid}"> <div class="col-md-4 form-group" ng-class="{'has-error':FormAdd.dateofjoining.$dirty && FormAdd.dateofjoining.$invalid, 'has-success':FormAdd.dateofjoining.$valid}">
@ -250,7 +250,7 @@
placeholder="Select Date of Joining" close-text="Close" required="required" datepicker-position="top" placeholder="Select Date of Joining" close-text="Close" required="required" datepicker-position="top"
max-date="todayDate"/> max-date="todayDate"/>
<span class="error text-small block" ng-if="FormAdd.dateofjoining.$dirty && FormAdd.dateofjoining.$error.required">Date of Joining required</span> <span class="error text-small block" ng-if="FormAdd.dateofjoining.$dirty && FormAdd.dateofjoining.$error.required">Date of Joining is required</span>
</div> </div>
</div> </div>
<div class="row"> <div class="row">

14
Apollo/assets/views/student/editStudentDetails.html
View File

@ -105,7 +105,7 @@
</label> </label>
<input type="text" placeholder="Enter First Name" tabindex="2" class="form-control" name="firstname" ng-model="p.Firstname" <input type="text" placeholder="Enter First Name" tabindex="2" class="form-control" name="firstname" ng-model="p.Firstname"
ng-pattern="/^[a-zA-Z.\s]*$/" required/> ng-pattern="/^[a-zA-Z.\s]*$/" required/>
<span class="error text-small block" ng-if="Form.firstname.$dirty && Form.firstname.$error.required">First Name required</span> <span class="error text-small block" ng-if="Form.firstname.$dirty && Form.firstname.$error.required">First Name is required</span>
<span class="error text-small block" ng-if="Form.firstname.$dirty && Form.firstname.$error.pattern">Invalid First Name </span> <span class="error text-small block" ng-if="Form.firstname.$dirty && Form.firstname.$error.pattern">Invalid First Name </span>
</div> </div>
<div class="col-md-4 form-group" ng-class="{'has-error':Form.lastname.$dirty && Form.lastname.$invalid, 'has-success':Form.lastname.$valid}"> <div class="col-md-4 form-group" ng-class="{'has-error':Form.lastname.$dirty && Form.lastname.$invalid, 'has-success':Form.lastname.$valid}">
@ -114,7 +114,7 @@
</label> </label>
<input type="text" placeholder="Enter Last Name" tabindex="3" class="form-control" name="lastname" ng-model="p.Lastname" <input type="text" placeholder="Enter Last Name" tabindex="3" class="form-control" name="lastname" ng-model="p.Lastname"
ng-pattern="/^[a-zA-Z.\s]*$/" required/> ng-pattern="/^[a-zA-Z.\s]*$/" required/>
<span class="error text-small block" ng-if="Form.lastname.$dirty && Form.lastname.$error.required">Last Name required</span> <span class="error text-small block" ng-if="Form.lastname.$dirty && Form.lastname.$error.required">Last Name is required</span>
<span class="error text-small block" ng-if="Form.lastname.$dirty && Form.lastname.$error.pattern">Invalid Last Name </span> <span class="error text-small block" ng-if="Form.lastname.$dirty && Form.lastname.$error.pattern">Invalid Last Name </span>
</div> </div>
</div> </div>
@ -125,7 +125,7 @@
</label> </label>
<input type="text" placeholder="Enter Father Name" tabindex="4" class="form-control" name="fathername" ng-model="p.Fathername" <input type="text" placeholder="Enter Father Name" tabindex="4" class="form-control" name="fathername" ng-model="p.Fathername"
ng-pattern="/^[a-zA-Z.\s]*$/" required/> ng-pattern="/^[a-zA-Z.\s]*$/" required/>
<span class="error text-small block" ng-if="Form.fathername.$dirty && Form.fathername.$error.required">Father Name required</span> <span class="error text-small block" ng-if="Form.fathername.$dirty && Form.fathername.$error.required">Father Name is required</span>
<span class="error text-small block" ng-if="Form.fathername.$dirty && Form.fathername.$error.pattern">Invalid Father Name </span> <span class="error text-small block" ng-if="Form.fathername.$dirty && Form.fathername.$error.pattern">Invalid Father Name </span>
</div> </div>
<div class="col-md-4 form-group" ng-class="{'has-error':Form.mothername.$dirty && Form.mothername.$invalid, 'has-success':Form.mothername.$valid}"> <div class="col-md-4 form-group" ng-class="{'has-error':Form.mothername.$dirty && Form.mothername.$invalid, 'has-success':Form.mothername.$valid}">
@ -135,7 +135,7 @@
<input type="text" placeholder="Enter Mother Name" tabindex="5" class="form-control" name="mothername" ng-model="p.MotherName" <input type="text" placeholder="Enter Mother Name" tabindex="5" class="form-control" name="mothername" ng-model="p.MotherName"
ng-pattern="/^[a-zA-Z.\s]*$/" required/> ng-pattern="/^[a-zA-Z.\s]*$/" required/>
<span class="error text-small block" ng-if="Form.mothername.$dirty && Form.mothername.$error.required">Mother Name required</span> <span class="error text-small block" ng-if="Form.mothername.$dirty && Form.mothername.$error.required">Mother Name is required</span>
<span class="error text-small block" ng-if="Form.mothername.$dirty && Form.mothername.$error.pattern">Invalid Mother Name </span> <span class="error text-small block" ng-if="Form.mothername.$dirty && Form.mothername.$error.pattern">Invalid Mother Name </span>
</div> </div>
<div class=" col-md-4 form-group" ng-class="{'has-error':Form.emailId.$dirty && Form.emailId.$invalid, 'has-success':Form.emailId.$valid}"> <div class=" col-md-4 form-group" ng-class="{'has-error':Form.emailId.$dirty && Form.emailId.$invalid, 'has-success':Form.emailId.$valid}">
@ -144,7 +144,7 @@
</label> </label>
<input type="email" tabindex="6" placeholder="Enter Email ID" class="form-control" name="emailId" ng-pattern="/^[-a-z0-9~!$%^&*_=+}{\'?]+(\.[-a-z0-9~!$%^&*_=+}{\'?]+)*@([a-z0-9_][-a-z0-9_]*(\.[-a-z0-9_]+)*\.(aero|arpa|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org|pro|travel|mobi|[a-z][a-z])|([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}))(:[0-9]{1,5})?$/i" <input type="email" tabindex="6" placeholder="Enter Email ID" class="form-control" name="emailId" ng-pattern="/^[-a-z0-9~!$%^&*_=+}{\'?]+(\.[-a-z0-9~!$%^&*_=+}{\'?]+)*@([a-z0-9_][-a-z0-9_]*(\.[-a-z0-9_]+)*\.(aero|arpa|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org|pro|travel|mobi|[a-z][a-z])|([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}))(:[0-9]{1,5})?$/i"
ng-model="p.EmailID" required> ng-model="p.EmailID" required>
<span class="error text-small block" ng-if="Form.emailId.$dirty && Form.primaryEmail.$invalid" ng-hide="Form.emailId.$error.email">Email is required.</span> <span class="error text-small block" ng-if="Form.emailId.$dirty && Form.emailId.$invalid" ng-hide="Form.emailId.$error.email">Email is required.</span>
<span class="error text-small block" ng-if="Form.emailId.$error.email">Please, enter a valid email address.</span> <span class="error text-small block" ng-if="Form.emailId.$error.email">Please, enter a valid email address.</span>
</div> </div>
</div> </div>
@ -345,7 +345,7 @@
Comments Comments
</label> </label>
<textarea maxlength="100" placeholder="Enter Comments" tabindex="26" class="form-control textdsc" name="Comments" ng-model="p.Comments"></textarea> <textarea maxlength="100" placeholder="Enter Comments" tabindex="26" class="form-control textdsc" name="Comments" ng-model="p.Comments"></textarea>
<span class="text-small block">Comments Should be Less than 100 Characters.</span> <span class="text-small block">Max 100 Characters.</span>
<!--<span class="error text-small block" ng-if="Form.DeactiveComments.$dirty && Form.DeactiveComments.$invalid">De-Active Comments is required</span>--> <!--<span class="error text-small block" ng-if="Form.DeactiveComments.$dirty && Form.DeactiveComments.$invalid">De-Active Comments is required</span>-->
</div> </div>
</div> </div>
@ -367,7 +367,7 @@
</label> </label>
<textarea maxlength="100" placeholder="Reason for Deactivating" tabindex="25" class="form-control textdsc" name="DeactiveComments" <textarea maxlength="100" placeholder="Reason for Deactivating" tabindex="25" class="form-control textdsc" name="DeactiveComments"
ng-model="p.DeactiveComments" required></textarea> ng-model="p.DeactiveComments" required></textarea>
<span class="text-small block">Comments Should be Less than 100 Characters.</span> <span class="text-small block">Max 100 Characters.</span>
<span class="error text-small block" ng-if="Form.DeactiveComments.$dirty && Form.DeactiveComments.$invalid">De-Active Comments is required</span> <span class="error text-small block" ng-if="Form.DeactiveComments.$dirty && Form.DeactiveComments.$invalid">De-Active Comments is required</span>
</div> </div>

15
Apollo/assets/views/student/studentDetailsModal.html
View File

@ -112,11 +112,11 @@
</tr> </tr>
<tr> <tr>
<td>Father Name</td> <td>Father's Name</td>
<td>{{items.studentDetails.Fathername}}</td> <td>{{items.studentDetails.Fathername}}</td>
</tr> </tr>
<tr> <tr>
<td>Mother Name</td> <td>Mother's Name</td>
<td> <td>
{{items.studentDetails.MotherName}} {{items.studentDetails.MotherName}}
@ -177,16 +177,17 @@
<div class="panel panel-white" id="panel2"> <div class="panel panel-white" id="panel2">
<div class="panel-heading"> <div class="panel-heading">
<div class="clearfix padding-5 space5" > <div class="clearfix padding-5 space5" >
<div class="row">
<div class="col-xs-3 text-center no-padding"> <div class="col-xs-12 text-center no-padding">
<!-- <!--
<h4 class="panel-title text-purple">{{course.UniversityName}} / {{course.CourseName}}</h4> <h4 class="panel-title text-purple">{{course.UniversityName}} / {{course.CourseName}}</h4>
--> -->
<a class="panel-title text-blue" tooltip="University"> <a class="panel-title text-blue" tooltip="University">
{{course.UniversityName}} <h3> {{course.UniversityName}}</h3>
</a> </a>
</div> </div>
<div class="col-xs-3 text-center no-padding"> </div>
<div class="col-xs-5 text-center no-padding">
<a class="text-blue"> <a class="text-blue">
Course &nbsp;:&nbsp;{{course.CourseName}} Course &nbsp;:&nbsp;{{course.CourseName}}
</a> </a>
@ -196,7 +197,7 @@
Enrollment ID &nbsp;:&nbsp;{{course.EnrollmentID}} Enrollment ID &nbsp;:&nbsp;{{course.EnrollmentID}}
</a> </a>
</div> </div>
<div class="col-xs-3 text-center no-padding"> <div class="col-xs-4 text-center no-padding">
<a class="text-blue"> <a class="text-blue">
Batch Name &nbsp;:&nbsp;{{course.BatchName}} Batch Name &nbsp;:&nbsp;{{course.BatchName}}
</a> </a>

15
Apollo/assets/views/student/studentView.html
View File

@ -258,11 +258,11 @@
</tr> </tr>
<tr> <tr>
<td>Father Name</td> <td>Father's Name</td>
<td>{{studentDetails.Fathername}}</td> <td>{{studentDetails.Fathername}}</td>
</tr> </tr>
<tr> <tr>
<td>Mother Name</td> <td>Mother's Name</td>
<td> <td>
{{studentDetails.MotherName}} {{studentDetails.MotherName}}
@ -353,16 +353,17 @@
<div class="panel panel-white" id="panel2"> <div class="panel panel-white" id="panel2">
<div class="panel-heading"> <div class="panel-heading">
<div class="clearfix padding-5 space5" > <div class="clearfix padding-5 space5" >
<div class="row">
<div class="col-xs-3 text-center no-padding"> <div class="col-xs-12 text-center no-padding">
<!-- <!--
<h4 class="panel-title text-purple">{{course.UniversityName}} / {{course.CourseName}}</h4> <h4 class="panel-title text-purple">{{course.UniversityName}} / {{course.CourseName}}</h4>
--> -->
<a class="panel-title text-blue" tooltip="University"> <a class="panel-title text-blue" tooltip="University">
{{course.UniversityName}} <h3>{{course.UniversityName}}</h3>
</a> </a>
</div> </div>
<div class="col-xs-3 text-center no-padding"> </div>
<div class="col-xs-5 text-center no-padding">
<a class="text-blue"> <a class="text-blue">
Course &nbsp;:&nbsp;{{course.CourseName}} Course &nbsp;:&nbsp;{{course.CourseName}}
</a> </a>
@ -372,7 +373,7 @@
Enrollment ID &nbsp;:&nbsp;{{course.EnrollmentID}} Enrollment ID &nbsp;:&nbsp;{{course.EnrollmentID}}
</a> </a>
</div> </div>
<div class="col-xs-3 text-center no-padding"> <div class="col-xs-4 text-center no-padding">
<a class="text-blue"> <a class="text-blue">
Batch Name &nbsp;:&nbsp;{{course.BatchName}} Batch Name &nbsp;:&nbsp;{{course.BatchName}}
</a> </a>

20
Apollo/assets/views/student/student_details.html
View File

@ -165,7 +165,7 @@
<table class="table table-hover" ng-controller="studentModalDemoCtrl"> <table class="table table-hover" ng-controller="studentModalDemoCtrl">
<thead> <thead>
<tr> <tr>
<th ng-click="sort('MobileNumber')">MobileNumber <th ng-click="sort('MobileNumber')">Mobile
<span class="glyphicon sort-icon" ng-show="sortKey=='MobileNumber'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span> <span class="glyphicon sort-icon" ng-show="sortKey=='MobileNumber'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
</th> </th>
<th ng-click="sort('Firstname')">Student Name <th ng-click="sort('Firstname')">Student Name
@ -324,7 +324,7 @@
</label> </label>
<input type="text" placeholder="Enter First Name" tabindex="2" class="form-control" name="firstname" ng-model="myModel.firstname" <input type="text" placeholder="Enter First Name" tabindex="2" class="form-control" name="firstname" ng-model="myModel.firstname"
ng-pattern="/^[a-zA-Z.\s]*$/" required/> ng-pattern="/^[a-zA-Z.\s]*$/" required/>
<span class="error text-small block" ng-if="Form.firstname.$dirty && Form.firstname.$error.required">First Name required</span> <span class="error text-small block" ng-if="Form.firstname.$dirty && Form.firstname.$error.required">First Name is required</span>
<span class="error text-small block" ng-if="Form.firstname.$dirty && Form.firstname.$error.pattern">Invalid First Name </span> <span class="error text-small block" ng-if="Form.firstname.$dirty && Form.firstname.$error.pattern">Invalid First Name </span>
</div> </div>
<div class="col-md-4 form-group" ng-class="{'has-error':Form.lastname.$dirty && Form.lastname.$invalid, 'has-success':Form.lastname.$valid}"> <div class="col-md-4 form-group" ng-class="{'has-error':Form.lastname.$dirty && Form.lastname.$invalid, 'has-success':Form.lastname.$valid}">
@ -333,7 +333,7 @@
</label> </label>
<input type="text" placeholder="Enter Last Name" tabindex="3" class="form-control" name="lastname" ng-model="myModel.lastname" <input type="text" placeholder="Enter Last Name" tabindex="3" class="form-control" name="lastname" ng-model="myModel.lastname"
ng-pattern="/^[a-zA-Z.\s]*$/" required/> ng-pattern="/^[a-zA-Z.\s]*$/" required/>
<span class="error text-small block" ng-if="Form.lastname.$dirty && Form.lastname.$error.required">Last Name required</span> <span class="error text-small block" ng-if="Form.lastname.$dirty && Form.lastname.$error.required">Last Name is required</span>
<span class="error text-small block" ng-if="Form.lastname.$dirty && Form.lastname.$error.pattern">Invalid Last Name </span> <span class="error text-small block" ng-if="Form.lastname.$dirty && Form.lastname.$error.pattern">Invalid Last Name </span>
</div> </div>
</div> </div>
@ -344,7 +344,7 @@
</label> </label>
<input type="text" placeholder="Enter Father Name" tabindex="4" class="form-control" name="fathername" ng-model="myModel.fathername" <input type="text" placeholder="Enter Father Name" tabindex="4" class="form-control" name="fathername" ng-model="myModel.fathername"
ng-pattern="/^[a-zA-Z.\s]*$/" required/> ng-pattern="/^[a-zA-Z.\s]*$/" required/>
<span class="error text-small block" ng-if="Form.fathername.$dirty && Form.fathername.$error.required">Father Name required</span> <span class="error text-small block" ng-if="Form.fathername.$dirty && Form.fathername.$error.required">Father Name is required</span>
<span class="error text-small block" ng-if="Form.fathername.$dirty && Form.fathername.$error.pattern">Invalid Father Name </span> <span class="error text-small block" ng-if="Form.fathername.$dirty && Form.fathername.$error.pattern">Invalid Father Name </span>
</div> </div>
<div class="col-md-4 form-group" ng-class="{'has-error':Form.mothername.$dirty && Form.mothername.$invalid, 'has-success':Form.mothername.$valid}"> <div class="col-md-4 form-group" ng-class="{'has-error':Form.mothername.$dirty && Form.mothername.$invalid, 'has-success':Form.mothername.$valid}">
@ -354,7 +354,7 @@
<input type="text" placeholder="Enter Mother Name" tabindex="5" class="form-control" name="mothername" ng-model="myModel.mothername" <input type="text" placeholder="Enter Mother Name" tabindex="5" class="form-control" name="mothername" ng-model="myModel.mothername"
ng-pattern="/^[a-zA-Z.\s]*$/" required/> ng-pattern="/^[a-zA-Z.\s]*$/" required/>
<span class="error text-small block" ng-if="Form.mothername.$dirty && Form.mothername.$error.required">Mother Name required</span> <span class="error text-small block" ng-if="Form.mothername.$dirty && Form.mothername.$error.required">Mother Name is required</span>
<span class="error text-small block" ng-if="Form.mothername.$dirty && Form.mothername.$error.pattern">Invalid Mother Name </span> <span class="error text-small block" ng-if="Form.mothername.$dirty && Form.mothername.$error.pattern">Invalid Mother Name </span>
</div> </div>
<div class=" col-md-4 form-group" ng-class="{'has-error':Form.emailId.$dirty && Form.emailId.$invalid, 'has-success':Form.emailId.$valid}"> <div class=" col-md-4 form-group" ng-class="{'has-error':Form.emailId.$dirty && Form.emailId.$invalid, 'has-success':Form.emailId.$valid}">
@ -363,7 +363,7 @@
</label> </label>
<input type="email" tabindex="6" placeholder="Enter Email ID" class="form-control" name="emailId" ng-pattern="/^[-a-z0-9~!$%^&*_=+}{\'?]+(\.[-a-z0-9~!$%^&*_=+}{\'?]+)*@([a-z0-9_][-a-z0-9_]*(\.[-a-z0-9_]+)*\.(aero|arpa|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org|pro|travel|mobi|[a-z][a-z])|([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}))(:[0-9]{1,5})?$/i" <input type="email" tabindex="6" placeholder="Enter Email ID" class="form-control" name="emailId" ng-pattern="/^[-a-z0-9~!$%^&*_=+}{\'?]+(\.[-a-z0-9~!$%^&*_=+}{\'?]+)*@([a-z0-9_][-a-z0-9_]*(\.[-a-z0-9_]+)*\.(aero|arpa|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org|pro|travel|mobi|[a-z][a-z])|([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}))(:[0-9]{1,5})?$/i"
ng-model="myModel.emailId" required> ng-model="myModel.emailId" required>
<span class="error text-small block" ng-if="Form.emailId.$dirty && Form.primaryEmail.$invalid" ng-hide="Form.emailId.$error.email">Email is required.</span> <span class="error text-small block" ng-if="Form.emailId.$dirty && Form.emailId.$invalid" ng-hide="Form.emailId.$error.email">Email is required.</span>
<span class="error text-small block" ng-if="Form.emailId.$error.email">Please, enter a valid email address.</span> <span class="error text-small block" ng-if="Form.emailId.$error.email">Please, enter a valid email address.</span>
</div> </div>
</div> </div>
@ -571,7 +571,7 @@
Comments Comments
</label> </label>
<textarea maxlength="100" placeholder="Enter Comments" tabindex="26" class="form-control textdsc" name="Comments" ng-model="myModel.Comments"></textarea> <textarea maxlength="100" placeholder="Enter Comments" tabindex="26" class="form-control textdsc" name="Comments" ng-model="myModel.Comments"></textarea>
<span class="text-small block">Comments Should be Less than 100 Characters.</span> <span class="text-small block">Max 100 Characters.</span>
<!--<span class="error text-small block" ng-if="Form.DeactiveComments.$dirty && Form.DeactiveComments.$invalid">De-Active Comments is required</span>--> <!--<span class="error text-small block" ng-if="Form.DeactiveComments.$dirty && Form.DeactiveComments.$invalid">De-Active Comments is required</span>-->
</div> </div>
</div> </div>
@ -599,7 +599,7 @@
</label> </label>
<textarea maxlength="100" placeholder="Reason for Deactivating" tabindex="27" class="form-control textdsc" name="DeactiveComments" <textarea maxlength="100" placeholder="Reason for Deactivating" tabindex="27" class="form-control textdsc" name="DeactiveComments"
ng-model="myModel.DeactiveComments" required></textarea> ng-model="myModel.DeactiveComments" required></textarea>
<span class="text-small block">Comments Should be Less than 100 Characters.</span> <span class="text-small block">Max 100 Characters.</span>
<span class="error text-small block" ng-if="Form.DeactiveComments.$dirty && Form.DeactiveComments.$invalid">De-Active Comments is required</span> <span class="error text-small block" ng-if="Form.DeactiveComments.$dirty && Form.DeactiveComments.$invalid">De-Active Comments is required</span>
</div> </div>
</div> </div>
@ -678,7 +678,7 @@
</label> </label>
<input type="text" name="enrollmentid" tabindex="27" placeholder="Enter Entollment ID" class="form-control" ng-model="myModelCourseAdd.enrollmentid" <input type="text" name="enrollmentid" tabindex="27" placeholder="Enter Entollment ID" class="form-control" ng-model="myModelCourseAdd.enrollmentid"
/> />
<span class="error text-small block" ng-if="Form.enrollmentid.$dirty && Form.enrollmentid.$error.required">Enrollment ID required</span> <span class="error text-small block" ng-if="Form.enrollmentid.$dirty && Form.enrollmentid.$error.required">Enrollment ID is required</span>
</div> </div>
<div class="col-md-4 form-group" ng-class="{'has-error':Form.dateofjoining.$dirty && Form.dateofjoining.$invalid, 'has-success':Form.dateofjoining.$valid}"> <div class="col-md-4 form-group" ng-class="{'has-error':Form.dateofjoining.$dirty && Form.dateofjoining.$invalid, 'has-success':Form.dateofjoining.$valid}">
@ -696,7 +696,7 @@
placeholder="Select Date of Joining" close-text="Close" required="required" datepicker-position="top" placeholder="Select Date of Joining" close-text="Close" required="required" datepicker-position="top"
max-date="todayDate"/> max-date="todayDate"/>
<span class="error text-small block" ng-if="Form.dateofjoining.$dirty && Form.dateofjoining.$error.required">Date of Joining required</span> <span class="error text-small block" ng-if="Form.dateofjoining.$dirty && Form.dateofjoining.$error.required">Date of Joining is required</span>
</div> </div>
</div> </div>
<div class="row"> <div class="row">

21
Apollo/assets/views/student/student_details_SuperAdmin.html
View File

@ -2,7 +2,8 @@
<section id="page-title"> <section id="page-title">
<div class="row"> <div class="row">
<div class="col-sm-8"> <div class="col-sm-8">
<h1 class="mainTitle" translate="Add/Edit Student Details">{{ mainTitle }}</h1> <h1 class="mainTitle" translate="Manage Student Details">{{ mainTitle }}</h1>
<span class="mainDescription">Add/Edit Student Details. </span>
</div> </div>
<div ncy-breadcrumb></div> <div ncy-breadcrumb></div>
</div> </div>
@ -350,7 +351,7 @@
</label> </label>
<input type="text" placeholder="Enter First Name" tabindex="2" class="form-control" name="firstname" ng-model="myModel.firstname" <input type="text" placeholder="Enter First Name" tabindex="2" class="form-control" name="firstname" ng-model="myModel.firstname"
ng-pattern="/^[a-zA-Z.\s]*$/" required/> ng-pattern="/^[a-zA-Z.\s]*$/" required/>
<span class="error text-small block" ng-if="Form.firstname.$dirty && Form.firstname.$error.required">First Name required</span> <span class="error text-small block" ng-if="Form.firstname.$dirty && Form.firstname.$error.required">First Name is required</span>
<span class="error text-small block" ng-if="Form.firstname.$dirty && Form.firstname.$error.pattern">Invalid First Name </span> <span class="error text-small block" ng-if="Form.firstname.$dirty && Form.firstname.$error.pattern">Invalid First Name </span>
</div> </div>
<div class="col-md-4 form-group" ng-class="{'has-error':Form.lastname.$dirty && Form.lastname.$invalid, 'has-success':Form.lastname.$valid}"> <div class="col-md-4 form-group" ng-class="{'has-error':Form.lastname.$dirty && Form.lastname.$invalid, 'has-success':Form.lastname.$valid}">
@ -359,7 +360,7 @@
</label> </label>
<input type="text" placeholder="Enter Last Name" tabindex="3" class="form-control" name="lastname" ng-model="myModel.lastname" <input type="text" placeholder="Enter Last Name" tabindex="3" class="form-control" name="lastname" ng-model="myModel.lastname"
ng-pattern="/^[a-zA-Z.\s]*$/" required/> ng-pattern="/^[a-zA-Z.\s]*$/" required/>
<span class="error text-small block" ng-if="Form.lastname.$dirty && Form.lastname.$error.required">Last Name required</span> <span class="error text-small block" ng-if="Form.lastname.$dirty && Form.lastname.$error.required">Last Name is required</span>
<span class="error text-small block" ng-if="Form.lastname.$dirty && Form.lastname.$error.pattern">Invalid Last Name </span> <span class="error text-small block" ng-if="Form.lastname.$dirty && Form.lastname.$error.pattern">Invalid Last Name </span>
</div> </div>
</div> </div>
@ -370,7 +371,7 @@
</label> </label>
<input type="text" placeholder="Enter Father Name" tabindex="4" class="form-control" name="fathername" ng-model="myModel.fathername" <input type="text" placeholder="Enter Father Name" tabindex="4" class="form-control" name="fathername" ng-model="myModel.fathername"
ng-pattern="/^[a-zA-Z.\s]*$/" required/> ng-pattern="/^[a-zA-Z.\s]*$/" required/>
<span class="error text-small block" ng-if="Form.fathername.$dirty && Form.fathername.$error.required">Father Name required</span> <span class="error text-small block" ng-if="Form.fathername.$dirty && Form.fathername.$error.required">Father Name is required</span>
<span class="error text-small block" ng-if="Form.fathername.$dirty && Form.fathername.$error.pattern">Invalid Father Name </span> <span class="error text-small block" ng-if="Form.fathername.$dirty && Form.fathername.$error.pattern">Invalid Father Name </span>
</div> </div>
<div class="col-md-4 form-group" ng-class="{'has-error':Form.mothername.$dirty && Form.mothername.$invalid, 'has-success':Form.mothername.$valid}"> <div class="col-md-4 form-group" ng-class="{'has-error':Form.mothername.$dirty && Form.mothername.$invalid, 'has-success':Form.mothername.$valid}">
@ -380,7 +381,7 @@
<input type="text" placeholder="Enter Mother Name" tabindex="5" class="form-control" name="mothername" ng-model="myModel.mothername" <input type="text" placeholder="Enter Mother Name" tabindex="5" class="form-control" name="mothername" ng-model="myModel.mothername"
ng-pattern="/^[a-zA-Z.\s]*$/" required/> ng-pattern="/^[a-zA-Z.\s]*$/" required/>
<span class="error text-small block" ng-if="Form.mothername.$dirty && Form.mothername.$error.required">Mother Name required</span> <span class="error text-small block" ng-if="Form.mothername.$dirty && Form.mothername.$error.required">Mother Name is required</span>
<span class="error text-small block" ng-if="Form.mothername.$dirty && Form.mothername.$error.pattern">Invalid Mother Name </span> <span class="error text-small block" ng-if="Form.mothername.$dirty && Form.mothername.$error.pattern">Invalid Mother Name </span>
</div> </div>
<div class=" col-md-4 form-group" ng-class="{'has-error':Form.emailId.$dirty && Form.emailId.$invalid, 'has-success':Form.emailId.$valid}"> <div class=" col-md-4 form-group" ng-class="{'has-error':Form.emailId.$dirty && Form.emailId.$invalid, 'has-success':Form.emailId.$valid}">
@ -389,7 +390,7 @@
</label> </label>
<input type="email" tabindex="6" placeholder="Enter Email ID" class="form-control" name="emailId" ng-pattern="/^[-a-z0-9~!$%^&*_=+}{\'?]+(\.[-a-z0-9~!$%^&*_=+}{\'?]+)*@([a-z0-9_][-a-z0-9_]*(\.[-a-z0-9_]+)*\.(aero|arpa|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org|pro|travel|mobi|[a-z][a-z])|([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}))(:[0-9]{1,5})?$/i" <input type="email" tabindex="6" placeholder="Enter Email ID" class="form-control" name="emailId" ng-pattern="/^[-a-z0-9~!$%^&*_=+}{\'?]+(\.[-a-z0-9~!$%^&*_=+}{\'?]+)*@([a-z0-9_][-a-z0-9_]*(\.[-a-z0-9_]+)*\.(aero|arpa|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org|pro|travel|mobi|[a-z][a-z])|([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}))(:[0-9]{1,5})?$/i"
ng-model="myModel.emailId" required> ng-model="myModel.emailId" required>
<span class="error text-small block" ng-if="Form.emailId.$dirty && Form.primaryEmail.$invalid" ng-hide="Form.emailId.$error.email">Email is required.</span> <span class="error text-small block" ng-if="Form.emailId.$dirty && Form.emailId.$invalid" ng-hide="Form.emailId.$error.email">Email is required.</span>
<span class="error text-small block" ng-if="Form.emailId.$error.email">Please, enter a valid email address.</span> <span class="error text-small block" ng-if="Form.emailId.$error.email">Please, enter a valid email address.</span>
</div> </div>
</div> </div>
@ -597,7 +598,7 @@
Comments Comments
</label> </label>
<textarea maxlength="100" placeholder="Enter Comments" tabindex="26" class="form-control textdsc" name="Comments" ng-model="myModel.Comments"></textarea> <textarea maxlength="100" placeholder="Enter Comments" tabindex="26" class="form-control textdsc" name="Comments" ng-model="myModel.Comments"></textarea>
<span class="text-small block">Comments Should be Less than 100 Characters.</span> <span class="text-small block">Max 100 Characters.</span>
<!--<span class="error text-small block" ng-if="Form.DeactiveComments.$dirty && Form.DeactiveComments.$invalid">De-Active Comments is required</span>--> <!--<span class="error text-small block" ng-if="Form.DeactiveComments.$dirty && Form.DeactiveComments.$invalid">De-Active Comments is required</span>-->
</div> </div>
</div> </div>
@ -625,7 +626,7 @@
</label> </label>
<textarea maxlength="100" placeholder="Reason for Deactivating" tabindex="27" class="form-control textdsc" name="DeactiveComments" <textarea maxlength="100" placeholder="Reason for Deactivating" tabindex="27" class="form-control textdsc" name="DeactiveComments"
ng-model="myModel.DeactiveComments" required></textarea> ng-model="myModel.DeactiveComments" required></textarea>
<span class="text-small block">Comments Should be Less than 100 Characters.</span> <span class="text-small block">Max 100 Characters.</span>
<span class="error text-small block" ng-if="Form.DeactiveComments.$dirty && Form.DeactiveComments.$invalid">De-Active Comments is required</span> <span class="error text-small block" ng-if="Form.DeactiveComments.$dirty && Form.DeactiveComments.$invalid">De-Active Comments is required</span>
</div> </div>
</div> </div>
@ -704,7 +705,7 @@
</label> </label>
<input type="text" name="enrollmentid" tabindex="27" placeholder="Enter Entollment ID" class="form-control" ng-model="myModelCourseAdd.enrollmentid" <input type="text" name="enrollmentid" tabindex="27" placeholder="Enter Entollment ID" class="form-control" ng-model="myModelCourseAdd.enrollmentid"
/> />
<span class="error text-small block" ng-if="Form.enrollmentid.$dirty && Form.enrollmentid.$error.required">Enrollment ID required</span> <span class="error text-small block" ng-if="Form.enrollmentid.$dirty && Form.enrollmentid.$error.required">Enrollment ID is required</span>
</div> </div>
<div class="col-md-4 form-group" ng-class="{'has-error':Form.dateofjoining.$dirty && Form.dateofjoining.$invalid, 'has-success':Form.dateofjoining.$valid}"> <div class="col-md-4 form-group" ng-class="{'has-error':Form.dateofjoining.$dirty && Form.dateofjoining.$invalid, 'has-success':Form.dateofjoining.$valid}">
@ -723,7 +724,7 @@
max-date="todayDate" max-date="todayDate"
/> />
<span class="error text-small block" ng-if="Form.dateofjoining.$dirty && Form.dateofjoining.$error.required">Date of Joining required</span> <span class="error text-small block" ng-if="Form.dateofjoining.$dirty && Form.dateofjoining.$error.required">Date of Joining is required</span>
</div> </div>
</div> </div>
<div class="row"> <div class="row">

8
Apollo/assets/views/studentStatusUpdate.html
View File

@ -11,10 +11,10 @@
<section id="page-title"> <section id="page-title">
<div class="row"> <div class="row">
<div class="col-sm-8"> <div class="col-sm-8">
<h1 class="mainTitle" translate="Student Activity Status"></h1> <h1 class="mainTitle" translate="Activity Status"></h1>
<!--
<span class="mainDescription">Over a dozen reusable components built to provide popovers, media objects, navigation, tooltips and much more. </span> <span class="mainDescription">Manage statuses for each activity. </span>
-->
</div> </div>
<div ncy-breadcrumb></div> <div ncy-breadcrumb></div>
</div> </div>

18
Apollo/assets/views/university.html
View File

@ -2,10 +2,10 @@
<section id="page-title"> <section id="page-title">
<div class="row"> <div class="row">
<div class="col-sm-8"> <div class="col-sm-8">
<h1 class="mainTitle" translate="View/Add University Details">{{ mainTitle }}</h1> <h1 class="mainTitle" translate="University">{{ mainTitle }}</h1>
<!--
<span class="mainDescription">Over a dozen reusable components built to provide popovers, media objects, navigation, tooltips and much more. </span> <span class="mainDescription">View/Add University Details. </span>
-->
</div> </div>
<div ncy-breadcrumb></div> <div ncy-breadcrumb></div>
</div> </div>
@ -67,7 +67,7 @@
<td>{{p.UniversityShortName}}</td> <td>{{p.UniversityShortName}}</td>
<td>{{p.UniversityName}}</td> <td>{{p.UniversityName}}</td>
<td>{{p.EmailID}}</td> <td>{{p.EmailID}}</td>
<td><span ng-if="p.IsActive == 1"> Active </span><span ng-if="p.IsActive == 0">De-Active</span></td> <td><span ng-if="p.IsActive == 1"> Active </span><span ng-if="p.IsActive == 0">In-Active</span></td>
<td style="text-align: center;"> <td style="text-align: center;">
<input type=button class="btn btn-info btn-xs" ladda="ldloading1.zoom_in" id="editRowBtn{{p.UniversityID}}" value="Modify" <input type=button class="btn btn-info btn-xs" ladda="ldloading1.zoom_in" id="editRowBtn{{p.UniversityID}}" value="Modify"
ng-click="setEditId(p.UniversityID);"> ng-click="setEditId(p.UniversityID);">
@ -123,7 +123,7 @@
<input type="text" placeholder="University Id" tabindex="1" class="form-control" name="universityId" ng-model="myModel.UniversityID" <input type="text" placeholder="University Id" tabindex="1" class="form-control" name="universityId" ng-model="myModel.UniversityID"
ng-pattern="/^[a-zA-Z0-9.\s]*$/" ng-blur='checkUnivIdExist()' required/> ng-pattern="/^[a-zA-Z0-9.\s]*$/" ng-blur='checkUnivIdExist()' required/>
<span class="error text-small block" ng-if="Form.universityId.$dirty && Form.universityId.$error.required">University Id</span> <span class="error text-small block" ng-if="Form.universityId.$dirty && Form.universityId.$error.required">University Id is required</span>
<span class="error text-small block" ng-if="Form.universityId.$dirty && Form.universityId.$error.pattern">Invalid university Id </span> <span class="error text-small block" ng-if="Form.universityId.$dirty && Form.universityId.$error.pattern">Invalid university Id </span>
</div> </div>
@ -135,7 +135,7 @@
<input type="text" placeholder="University Name" tabindex="3" class="form-control" name="UniversityName" ng-model="myModel.UniversityName" <input type="text" placeholder="University Name" tabindex="3" class="form-control" name="UniversityName" ng-model="myModel.UniversityName"
required/> required/>
<span class="error text-small block" ng-if="Form.UniversityName.$dirty && Form.UniversityName.$invalid">University Name required </span> <span class="error text-small block" ng-if="Form.UniversityName.$dirty && Form.UniversityName.$invalid">University Name is required </span>
</div> </div>
<div class="col-md-4 form-group" ng-class="{'has-error':Form.UniversityShortName.$dirty && Form.UniversityShortName.$invalid, 'has-success':Form.UniversityShortName.$valid}"> <div class="col-md-4 form-group" ng-class="{'has-error':Form.UniversityShortName.$dirty && Form.UniversityShortName.$invalid, 'has-success':Form.UniversityShortName.$valid}">
@ -145,7 +145,7 @@
<input type="text" placeholder="University Short Name" tabindex="2" class="form-control" name="UniversityShortName" ng-model="myModel.UniversityShortName" <input type="text" placeholder="University Short Name" tabindex="2" class="form-control" name="UniversityShortName" ng-model="myModel.UniversityShortName"
required/> required/>
<span class="error text-small block" ng-if="Form.UniversityShortName.$dirty && Form.UniversityShortName.$error.required">University Short Name required</span> <span class="error text-small block" ng-if="Form.UniversityShortName.$dirty && Form.UniversityShortName.$error.required">University Short Name is required</span>
<!--<span class="error text-small block" ng-if="Form.UniversityShortName.$dirty && Form.UniversityShortName.$error.pattern">Invalid University Short Name </span>--> <!--<span class="error text-small block" ng-if="Form.UniversityShortName.$dirty && Form.UniversityShortName.$error.pattern">Invalid University Short Name </span>-->
</div> </div>
</div> </div>
@ -167,7 +167,7 @@
</label> </label>
<input type="email" tabindex="5" placeholder="Enter Email ID" class="form-control" name="emailId" ng-pattern="/^[-a-z0-9~!$%^&*_=+}{\'?]+(\.[-a-z0-9~!$%^&*_=+}{\'?]+)*@([a-z0-9_][-a-z0-9_]*(\.[-a-z0-9_]+)*\.(aero|arpa|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org|pro|travel|mobi|[a-z][a-z])|([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}))(:[0-9]{1,5})?$/i" <input type="email" tabindex="5" placeholder="Enter Email ID" class="form-control" name="emailId" ng-pattern="/^[-a-z0-9~!$%^&*_=+}{\'?]+(\.[-a-z0-9~!$%^&*_=+}{\'?]+)*@([a-z0-9_][-a-z0-9_]*(\.[-a-z0-9_]+)*\.(aero|arpa|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org|pro|travel|mobi|[a-z][a-z])|([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}))(:[0-9]{1,5})?$/i"
ng-model="myModel.EmailID" required> ng-model="myModel.EmailID" required>
<span class="error text-small block" ng-if="Form.emailId.$dirty && Form.primaryEmail.$invalid" ng-hide="Form.emailId.$error.email">Email is required.</span> <span class="error text-small block" ng-if="Form.emailId.$dirty && Form.emailId.$invalid" ng-hide="Form.emailId.$error.email">Email is required.</span>
<span class="error text-small block" ng-if="Form.emailId.$error.email">Please, enter a valid email address.</span> <span class="error text-small block" ng-if="Form.emailId.$error.email">Please, enter a valid email address.</span>
</div> </div>
<div class="col-md-4 form-group" ng-class="{'has-error':Form.Address.$dirty && Form.Address.$invalid, 'has-success':Form.Address.$valid}"> <div class="col-md-4 form-group" ng-class="{'has-error':Form.Address.$dirty && Form.Address.$invalid, 'has-success':Form.Address.$valid}">