diff --git a/Apollo/api/application/config/routes.php b/Apollo/api/application/config/routes.php index 5144544a..5492d267 100755 --- a/Apollo/api/application/config/routes.php +++ b/Apollo/api/application/config/routes.php @@ -90,6 +90,8 @@ $route['loadFollowupDetails'] = 'Call_Tracking_Controller/loadFollowupDetails'; $route['getRecentLeadDetails'] = 'Call_Tracking_Controller/getRecentLeadDetails'; $route['getRecentCloseDetails'] = 'Call_Tracking_Controller/getRecentCloseDetails'; $route['getRecentPendingDetails'] = 'Call_Tracking_Controller/getRecentPendingDetails'; +$route['callAsImportantFlag'] = 'Call_Tracking_Controller/callAsImportantFlag'; + // university diff --git a/Apollo/api/application/controllers/Call_Tracking_Controller.php b/Apollo/api/application/controllers/Call_Tracking_Controller.php index 9b765e3f..9520db1b 100755 --- a/Apollo/api/application/controllers/Call_Tracking_Controller.php +++ b/Apollo/api/application/controllers/Call_Tracking_Controller.php @@ -42,6 +42,8 @@ class Call_Tracking_Controller extends REST_Controller { $this->methods['getRecentLeadDetails_post']['limit'] = 1000; // 50 requests per hour per user/key $this->methods['getRecentCloseDetails_post']['limit'] = 1000; // 50 requests per hour per user/key $this->methods['getRecentPendingDetails_post']['limit'] = 1000; // 50 requests per hour per user/key + $this->methods['callAsImportantFlag_post']['limit'] = 1000; // 50 requests per hour per user/key + // load the model $this->load->model('Calltracking_model', 'Calltracking_model'); @@ -368,6 +370,32 @@ class Call_Tracking_Controller extends REST_Controller { } + /* + * mark as important for call + * created by kms + * */ + public function callAsImportantFlag_post(){ + $trackID = $this->post('trackId'); + $flagStatus = $this->post('flag'); + $updateFlag = $this->Calltracking_model->updateFlagStatus($trackID,$flagStatus); + + if ($updateFlag) + { + $updateFlag['status'] = REST_Controller::HTTP_OK; + // Set the response and exit + $this->response($updateFlag, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code + } + else + { + // Set the response and exit + $this->response([ + 'message' => 'No records found!', + 'status' => REST_Controller::HTTP_NOT_FOUND + ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code + } + + + } diff --git a/Apollo/api/application/controllers/StudentView_Controller.php b/Apollo/api/application/controllers/StudentView_Controller.php index 687cea79..0f995206 100755 --- a/Apollo/api/application/controllers/StudentView_Controller.php +++ b/Apollo/api/application/controllers/StudentView_Controller.php @@ -44,8 +44,9 @@ class StudentView_Controller extends REST_Controller public function getStudentInfo_post() { $requestedBy = $this->post('requestedBy'); + $requestedFrom = $this->post('requestedFrom'); - $studentListDetails = $this->studentview_model->getStudentInfo($requestedBy);// Check if the employee exist + $studentListDetails = $this->studentview_model->getStudentInfo($requestedBy,$requestedFrom);// Check if the employee exist if ($studentListDetails) { $studentListDetails['status'] = REST_Controller::HTTP_OK; // Set the response and exit diff --git a/Apollo/api/application/models/Calltracking_model.php b/Apollo/api/application/models/Calltracking_model.php index d3ec1b95..a253999b 100755 --- a/Apollo/api/application/models/Calltracking_model.php +++ b/Apollo/api/application/models/Calltracking_model.php @@ -177,6 +177,8 @@ class Calltracking_model extends CI_Model { public function getStaff($status=null,$branchID=null,$userType=null,$requestedBy) { + if($userType != SUPER_ADMIN){ + $this->db->select('LO.ID,ST.StaffID,ST.Firstname'); $this->db->from(LOGIN.' as LO'); $this->db->join(STAFF.' as ST', 'ST.StaffID = LO.StaffID'); @@ -202,10 +204,63 @@ class Calltracking_model extends CI_Model { else{ $result_staff[]=""; } + } + else{ + $this->db->select('BR.BranchCode,BR.BranchName'); + $this->db->from(BRANCH.' as BR'); + //$this->db->where('BR.IsActive',$status); + $branchDetails=$this->db->get(); + + if($branchDetails->result()){ + foreach ($branchDetails->result() as $branchRow){ + $branch_array['BranchCode'] = $branchRow->BranchCode; + $branch_array['BranchName'] = $branchRow->BranchName.'-'.$branchRow->BranchCode; + $branch_array['staffDetails'] = $this->superAdminBranch($branchRow->BranchCode,$status); + $result_staff[]=$branch_array; + } + + } + else{ + $result_staff[]=""; + } + + + } return $result_staff; } + /* + * get staff details based on branch id + * created by kms + * */ + public function superAdminBranch($branchID,$status){ + + $this->db->select('LO.ID,ST.StaffID,ST.Firstname'); + $this->db->from(LOGIN.' as LO'); + $this->db->join(STAFF.' as ST', 'ST.StaffID = LO.StaffID'); + $this->db->where('ST.IsActive',$status); + + $this->db->where('ST.BranchCode',$branchID); + $staffDetails=$this->db->get(); + if($staffDetails){ + $result_staff = array(); + foreach ($staffDetails->result() as $row) + { + $university_array['loginId'] = $row->ID; + $university_array['staffName'] = $row->Firstname.'-'.$row->StaffID; + $result_staff[]=$university_array; + } + + } + else{ + $result_staff[]=""; + } + + return $result_staff; + + } + /* * add lead details @@ -258,7 +313,7 @@ class Calltracking_model extends CI_Model { public function getTrackingDetails($search=null) { - $this->db->select('LTF.FollowupOn,LD.LeadID,LD.LeadName,LD.MobileNumber,LD.IsNewEnquiry,LT.TrackingID,LT.ActivityStatus,LT.AssignedTo,LT.StatusCode,LT.University,LT.Course,LT.AlternateMobile,LT.Address,ST.StaffID,ST.Firstname,PLD1.ListCode as statusListCode,PLD1.ListName as statusListName,AV.ActivityID,AV.ActivityName'); + $this->db->select('LTF.FollowupOn,LD.LeadID,LD.LeadName,LD.MobileNumber,LD.IsNewEnquiry,LT.TrackingID,LT.ActivityStatus,LT.AssignedTo,LT.StatusCode,LT.University,LT.Course,LT.AlternateMobile,LT.Address,LT.Flag,ST.StaffID,ST.Firstname,PLD1.ListCode as statusListCode,PLD1.ListName as statusListName,AV.ActivityID,AV.ActivityName'); $this->db->from(LEAD_TRACKING_FOLLOWUP.' as LTF'); $this->db->join(LEAD_TRACKING.' as LT','LT.TrackingID=LTF.TrackingID'); $this->db->join(LEAD_DETAILS.' as LD', 'LT.LeadID = LD.LeadID'); @@ -312,6 +367,7 @@ class Calltracking_model extends CI_Model { $tracking_array["LeadName"]=$row->LeadName; $tracking_array["MobileNumber"]=$row->MobileNumber; $tracking_array["IsNewEnquiry"]=$row->IsNewEnquiry; + $tracking_array["Flag"]=$row->Flag; $tracking_array["TrackingID"]=$row->TrackingID; $tracking_array["ActivityStatus"]=$row->ActivityStatus; $tracking_array["AssignedTo"]=$row->AssignedTo; @@ -348,7 +404,7 @@ class Calltracking_model extends CI_Model { public function getPrevPendingTrackingDetails($search=null) { - $this->db->select('LTF.FollowupOn,LD.LeadID,LD.LeadName,LD.MobileNumber,LD.IsNewEnquiry,LT.TrackingID,LT.ActivityStatus,LT.AssignedTo,LT.StatusCode,LT.University,LT.Course,LT.AlternateMobile,LT.Address,ST.StaffID,ST.Firstname,PLD1.ListCode as statusListCode,PLD1.ListName as statusListName,AV.ActivityID,AV.ActivityName'); + $this->db->select('LTF.FollowupOn,LD.LeadID,LD.LeadName,LD.MobileNumber,LD.IsNewEnquiry,LT.TrackingID,LT.ActivityStatus,LT.AssignedTo,LT.StatusCode,LT.University,LT.Course,LT.AlternateMobile,LT.Address,LT.Flag,ST.StaffID,ST.Firstname,PLD1.ListCode as statusListCode,PLD1.ListName as statusListName,AV.ActivityID,AV.ActivityName'); $this->db->from(LEAD_TRACKING_FOLLOWUP.' as LTF'); $this->db->join(LEAD_TRACKING.' as LT','LT.TrackingID=LTF.TrackingID'); $this->db->join(LEAD_DETAILS.' as LD', 'LT.LeadID = LD.LeadID'); @@ -383,6 +439,7 @@ class Calltracking_model extends CI_Model { $tracking_array["LeadName"]=$row->LeadName; $tracking_array["MobileNumber"]=$row->MobileNumber; $tracking_array["IsNewEnquiry"]=$row->IsNewEnquiry; + $tracking_array["Flag"]=$row->Flag; $tracking_array["TrackingID"]=$row->TrackingID; $tracking_array["ActivityStatus"]=$row->ActivityStatus; $tracking_array["AssignedTo"]=$row->AssignedTo; @@ -498,7 +555,7 @@ class Calltracking_model extends CI_Model { public function getLoadFollowupDetails($trackingID) { - $this->db->select('LD.LeadID,LD.LeadName,LD.MobileNumber,LD.IsNewEnquiry,LT.TrackingID,LT.ActivityStatus,LT.AssignedTo,LT.StatusCode,LT.University,LT.Course,LT.AlternateMobile,LT.Address,ST.StaffID,ST.Firstname,PLD1.ListCode as statusListCode,PLD1.ListName as statusListName,AV.ActivityID,AV.ActivityName'); + $this->db->select('LD.LeadID,LD.LeadName,LD.MobileNumber,LD.IsNewEnquiry,LT.TrackingID,LT.ActivityStatus,LT.AssignedTo,LT.CreatedBranch,LT.StatusCode,LT.University,LT.Course,LT.AlternateMobile,LT.Address,ST.StaffID,ST.Firstname,PLD1.ListCode as statusListCode,PLD1.ListName as statusListName,AV.ActivityID,AV.ActivityName'); $this->db->from(LEAD_DETAILS.' as LD'); $this->db->join(LEAD_TRACKING.' as LT', 'LT.LeadID = LD.LeadID'); $this->db->join(LOGIN.' as LO', 'LO.ID = LT.AssignedTo'); @@ -532,6 +589,7 @@ class Calltracking_model extends CI_Model { $tracking_array["TrackingID"]=$row->TrackingID; $tracking_array["ActivityStatus"]=$row->ActivityStatus; $tracking_array["AssignedTo"]=$row->AssignedTo; + $tracking_array["CreatedBranch"]=$row->CreatedBranch; $tracking_array["Firstname"]=$row->Firstname; $tracking_array["StatusCode"]=$row->StatusCode; $tracking_array["statusName"]=$row->statusListName; @@ -943,7 +1001,7 @@ class Calltracking_model extends CI_Model { public function getRecentleadDetails($search=null) { - $this->db->select('LD.LeadID,LD.LeadName,LD.MobileNumber,LD.IsNewEnquiry,LT.TrackingID,LT.ActivityStatus,LT.AssignedTo,LT.StatusCode,LT.University,LT.Course,LT.AlternateMobile,LT.Address,ST.StaffID,ST.Firstname,PLD1.ListCode as statusListCode,PLD1.ListName as statusListName,AV.ActivityID,AV.ActivityName,DATE_FORMAT(LT.CreatedOn, "%d-%m-%Y") AS CreatedOn,DATE_FORMAT(LT.UpdatedOn, "%d-%m-%Y") AS UpdatedOn'); + $this->db->select('LD.LeadID,LD.LeadName,LD.MobileNumber,LD.IsNewEnquiry,LT.TrackingID,LT.ActivityStatus,LT.AssignedTo,LT.StatusCode,LT.University,LT.Course,LT.AlternateMobile,LT.Address,LT.Flag,ST.StaffID,ST.Firstname,PLD1.ListCode as statusListCode,PLD1.ListName as statusListName,AV.ActivityID,AV.ActivityName,DATE_FORMAT(LT.CreatedOn, "%d-%m-%Y") AS CreatedOn,DATE_FORMAT(LT.UpdatedOn, "%d-%m-%Y") AS UpdatedOn'); $this->db->from(LEAD_DETAILS.' as LD'); $this->db->join(LEAD_TRACKING.' as LT', 'LT.LeadID = LD.LeadID'); $this->db->join(LOGIN.' as LO', 'LO.ID = LT.AssignedTo'); @@ -976,6 +1034,7 @@ class Calltracking_model extends CI_Model { $tracking_array["MobileNumber"]=$row->MobileNumber; $tracking_array["IsNewEnquiry"]=$row->IsNewEnquiry; $tracking_array["TrackingID"]=$row->TrackingID; + $tracking_array["Flag"]=$row->Flag; $tracking_array["ActivityStatus"]=$row->ActivityStatus; $tracking_array["AssignedTo"]=$row->AssignedTo; $tracking_array["Firstname"]=$row->Firstname; @@ -1012,7 +1071,7 @@ class Calltracking_model extends CI_Model { * */ public function getRecentCloseDetails($search=null) { - $this->db->select('LD.LeadID,LD.LeadName,LD.MobileNumber,LD.IsNewEnquiry,LT.TrackingID,LT.ActivityStatus,LT.AssignedTo,LT.StatusCode,LT.University,LT.Course,LT.AlternateMobile,LT.Address,ST.StaffID,ST.Firstname,PLD1.ListCode as statusListCode,PLD1.ListName as statusListName,AV.ActivityID,AV.ActivityName,DATE_FORMAT(LT.CreatedOn, "%d-%m-%Y") AS CreatedOn,DATE_FORMAT(LT.UpdatedOn, "%d-%m-%Y") AS UpdatedOn'); + $this->db->select('LD.LeadID,LD.LeadName,LD.MobileNumber,LD.IsNewEnquiry,LT.TrackingID,LT.ActivityStatus,LT.AssignedTo,LT.StatusCode,LT.University,LT.Course,LT.AlternateMobile,LT.Address,LT.Flag,ST.StaffID,ST.Firstname,PLD1.ListCode as statusListCode,PLD1.ListName as statusListName,AV.ActivityID,AV.ActivityName,DATE_FORMAT(LT.CreatedOn, "%d-%m-%Y") AS CreatedOn,DATE_FORMAT(LT.UpdatedOn, "%d-%m-%Y") AS UpdatedOn'); $this->db->from(LEAD_DETAILS.' as LD'); $this->db->join(LEAD_TRACKING.' as LT', 'LT.LeadID = LD.LeadID'); $this->db->join(LOGIN.' as LO', 'LO.ID = LT.AssignedTo'); @@ -1046,6 +1105,7 @@ class Calltracking_model extends CI_Model { $tracking_array["MobileNumber"]=$row->MobileNumber; $tracking_array["IsNewEnquiry"]=$row->IsNewEnquiry; $tracking_array["TrackingID"]=$row->TrackingID; + $tracking_array["Flag"]=$row->Flag; $tracking_array["ActivityStatus"]=$row->ActivityStatus; $tracking_array["AssignedTo"]=$row->AssignedTo; $tracking_array["Firstname"]=$row->Firstname; @@ -1082,7 +1142,7 @@ class Calltracking_model extends CI_Model { * */ public function getRecentPendingDetails($search=null) { - $this->db->select('LD.LeadID,LD.LeadName,LD.MobileNumber,LD.IsNewEnquiry,LT.TrackingID,LT.ActivityStatus,LT.AssignedTo,LT.StatusCode,LT.University,LT.Course,LT.AlternateMobile,LT.Address,ST.StaffID,ST.Firstname,PLD1.ListCode as statusListCode,PLD1.ListName as statusListName,AV.ActivityID,AV.ActivityName,DATE_FORMAT(LT.CreatedOn, "%d-%m-%Y") AS CreatedOn,DATE_FORMAT(LT.UpdatedOn, "%d-%m-%Y") AS UpdatedOn'); + $this->db->select('LD.LeadID,LD.LeadName,LD.MobileNumber,LD.IsNewEnquiry,LT.TrackingID,LT.ActivityStatus,LT.AssignedTo,LT.StatusCode,LT.University,LT.Course,LT.AlternateMobile,LT.Address,LT.Flag,ST.StaffID,ST.Firstname,PLD1.ListCode as statusListCode,PLD1.ListName as statusListName,AV.ActivityID,AV.ActivityName,DATE_FORMAT(LT.CreatedOn, "%d-%m-%Y") AS CreatedOn,DATE_FORMAT(LT.UpdatedOn, "%d-%m-%Y") AS UpdatedOn'); $this->db->from(LEAD_DETAILS.' as LD'); $this->db->join(LEAD_TRACKING.' as LT', 'LT.LeadID = LD.LeadID'); $this->db->join(LOGIN.' as LO', 'LO.ID = LT.AssignedTo'); @@ -1117,6 +1177,7 @@ class Calltracking_model extends CI_Model { $tracking_array["MobileNumber"]=$row->MobileNumber; $tracking_array["IsNewEnquiry"]=$row->IsNewEnquiry; $tracking_array["TrackingID"]=$row->TrackingID; + $tracking_array["Flag"]=$row->Flag; $tracking_array["ActivityStatus"]=$row->ActivityStatus; $tracking_array["AssignedTo"]=$row->AssignedTo; $tracking_array["Firstname"]=$row->Firstname; @@ -1147,5 +1208,24 @@ class Calltracking_model extends CI_Model { return $result_array; } + /* + * update call track as important + * created by kms + * */ + public function updateFlagStatus($trackID=null,$flagStatus=null){ + $updateDetails['Flag']= $flagStatus; + $this->db->where('TrackingID',$trackID); + $this->db->update(LEAD_TRACKING, $updateDetails); + if($this->db->affected_rows() > '0') { + $result['updatedStatus']=true; + + } + else{ + $result['updatedStatus']=false; + + } + return $result; + + } } \ No newline at end of file diff --git a/Apollo/api/application/models/Studentview_model.php b/Apollo/api/application/models/Studentview_model.php index 776172a0..dca06a32 100755 --- a/Apollo/api/application/models/Studentview_model.php +++ b/Apollo/api/application/models/Studentview_model.php @@ -16,23 +16,43 @@ class Studentview_model extends CI_Model * */ // get student list based on login user - public function getStudentInfo($requestedBy=null) + public function getStudentInfo($requestedBy=null,$requestFrom=null) { - $this->db->select('ST.*'); - $this->db->from( LOGIN . ' as LO'); - $this->db->join( STUDENTS . ' as ST', 'LO.StaffID = ST.StudentID'); - $this->db->where('LO.ID', $requestedBy); - $studentDetails = $this->db->get()->first_row(); - if($studentDetails){ - $result['studentStatus'] = true; - $result['studentDetails'] = $studentDetails; - // get student course details - $result['courseDetails'] = $this->getStudentCourse($studentDetails->StudentID); + if($requestFrom !='1'){ + $this->db->select('ST.*'); + $this->db->from( LOGIN . ' as LO'); + $this->db->join( STUDENTS . ' as ST', 'LO.StaffID = ST.StudentID'); + $this->db->where('LO.ID', $requestedBy); + $studentDetails = $this->db->get()->first_row(); + if($studentDetails){ + $result['studentStatus'] = true; + $result['studentDetails'] = $studentDetails; + // get student course details + $result['courseDetails'] = $this->getStudentCourse($studentDetails->StudentID); + } + else{ + $result['studentStatus'] = false; + $result['studentInfo'] = ""; + } } else{ - $result['studentStatus'] = false; - $result['studentInfo'] = ""; + $this->db->select('ST.*'); + $this->db->from( LOGIN . ' as LO'); + $this->db->join( STUDENTS . ' as ST', 'LO.StaffID = ST.StudentID'); + $this->db->where('ST.StudentID', $requestedBy); + $studentDetails = $this->db->get()->first_row(); + if($studentDetails){ + $result['studentStatus'] = true; + $result['studentDetails'] = $studentDetails; + // get student course details + $result['courseDetails'] = $this->getStudentCourse($studentDetails->StudentID); + } + else{ + $result['studentStatus'] = false; + $result['studentInfo'] = ""; + } } + return $result; } diff --git a/Apollo/assets/js/controllers/callTrackingCtrl.js b/Apollo/assets/js/controllers/callTrackingCtrl.js index a98e175c..40cfc655 100755 --- a/Apollo/assets/js/controllers/callTrackingCtrl.js +++ b/Apollo/assets/js/controllers/callTrackingCtrl.js @@ -6,6 +6,7 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableParams", "API_POINTS", "$localStorage", "$http", "$state", function ($scope,$rootScope,toaster, $filter, ngTableParams, apiPoint, $localStorage, $http, $state) { localStorage.setItem('searchName',''); localStorage.setItem('searchMobile',''); + $scope.userType=JSON.parse(localStorage.getItem('localObj')).localType; $scope.myModel = { "studentName": "", "mobileNumber": "", @@ -19,7 +20,9 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter", "comments":'', "enquiryStatus":'', "alterMobileNumber":'', - "address":'' + "address":'', + "important":false, + "branch":"" }; //get current date @@ -32,8 +35,27 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter", $scope.modifyDate.add(30, 'days'); $scope.futureDate = $filter('date')($scope.modifyDate, 'dd-MM-yyyy'); $scope.myModel.date=$scope.currentDate; - $scope.myModel.search=$filter('date')(new Date(), 'yyyy-MM-dd'); - $scope.myModel.searchDate=$scope.currentDate; + + if(localStorage.getItem('searchObj') !='' && localStorage.getItem('searchObj') !=null && localStorage.getItem('searchObj') !=undefined){ + $scope.myModel.search=JSON.parse(localStorage.getItem('searchObj')).fromDate; + $scope.myModel.searchDate=JSON.parse(localStorage.getItem('searchObj')).fromDate; + $scope.myModel.dateTo = JSON.parse(localStorage.getItem('searchObj')).toDate; + $scope.search2 = JSON.parse(localStorage.getItem('searchObj')).searchName; + $scope.search3 = { + "ActivityName" :JSON.parse(localStorage.getItem('searchObj')).serachActivity + }; + $scope.search4 = { "Firstname": JSON.parse(localStorage.getItem('searchObj')).searchAssignTo + }; + $scope.search5 = { "statusName" : JSON.parse(localStorage.getItem('searchObj')).searchStatus + }; + localStorage.setItem('searchObj',''); + } + else{ + $scope.myModel.search=$filter('date')(new Date(), 'yyyy-MM-dd'); + $scope.myModel.searchDate=$scope.currentDate; + } + + $scope.toMinDate = $filter('date')($scope.modifyMinDate, 'MM-dd-yyyy'); @@ -42,7 +64,7 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter", $scope.myModel.search=''; $scope.toMinDate = ''; - $scope.myModel.dateTo=''; + $scope.myModel.dateTo=''; } else{ if(type=='2'){ @@ -76,6 +98,7 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter", } + /* * make a search date array */ @@ -121,23 +144,76 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter", } + /* + * mark call as important + * created by kms + * */ + $scope.markAsImportant = function (trackID,flag) { + + var markas = { + method: 'POST', + url: apiPoint.url + 'callAsImportantFlag/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + flag:flag, + trackId:trackID, + updatedBy: JSON.parse(localStorage.getItem('localObj')).localUserID, + branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID + } + }; + $http(markas).then(function (response) { + if (response.data.status==200 && response.data.updatedStatus) { + $scope.checkToDateForMark($scope.myModel); + + } else { + $scope.checkToDateForMark($scope.myModel); + + } + }); + + + } + /* + * check to date while marking + * */ + $scope.checkToDateForMark = function (value) { + + if(value.searchDate==null || value.searchDate==undefined){ + $scope.myModel.dateTo=''; + $scope.myModel.search=''; + $scope.toMinDate = ''; + } + else{ + $scope.filterSearch=$filter('date')(value.searchDate, 'dd-MM-yyyy'); + $scope.search=$scope.filterSearch; + + } + $scope.searchDateArray(value); + + } + /* * edit track details * created by kms * */ - $scope.setEditId = function (p,search1,search2,search3,search4,search5) { + $scope.setEditId = function (p,search1,search2,search3,search4,search5,fromDate,toDate) { $scope.searchData = { "searchDate": search1, "searchName": search2, 'serachActivity': search3, 'searchAssignTo': search4, 'searchStatus': search5, - 'callFrom':"details" + 'callFrom':"details", + "fromDate": fromDate, + "toDate": toDate, } localStorage.setItem('searchObj', JSON.stringify($scope.searchData)); localStorage.setItem('trackID', p.TrackingID); localStorage.setItem('count', 0); + $rootScope.followupDetails=p; /* $rootScope.myModel1.status=$rootScope.followupDetails.StatusCode; $rootScope.currentDate1=new Date().getFullYear() + '-' + ('0' + (new Date().getMonth() + 1)).slice(-2) + '-' + ('0' + new Date().getDate()).slice(-2); @@ -155,6 +231,7 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter", * */ $scope.trackForm = { submit: function (form, myModel,loading) { + if(isNaN(myModel.date)){ $scope.nextFollowupDate = myModel.date; @@ -186,7 +263,16 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter", $scope.ldloading1 = {}; $scope.ldloading1[loading.replace('-', '_')] = true; + if($scope.userType !='R004'){ + $scope.updateBranchID = JSON.parse(localStorage.getItem('localObj')).localBranchID; + $scope.updateAssignTo = myModel.assignedTo; + } + else{ + $scope.updateBranchID = myModel.branch.BranchCode; + $scope.updateAssignTo = myModel.assignedTo; + + } var addLead = { method: 'POST', @@ -201,7 +287,8 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter", courseName: myModel.courseName, date: $scope.nextFollowupDate, activity: myModel.activity.activityID, - assignedTo: myModel.assignedTo, + assignedTo: $scope.updateAssignTo, + status: myModel.status, referedBy: myModel.referedBy, comments:myModel.comments, @@ -209,7 +296,7 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter", address:myModel.address, enquiryStatus:myModel.enquiryStatus, createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID, - branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID + branchId: $scope.updateBranchID @@ -423,9 +510,6 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter", } - - - }]); /* @@ -436,7 +520,10 @@ app.controller('callTrackingLeadCtrl', ["$scope","$rootScope","toaster", "$filte localStorage.setItem('searchMobile',''); $scope.myModel = { "leadDate": new Date(), - }; + "search":$filter('date')(new Date(), 'yyyy-MM-dd') + +}; + $scope.hideDateSearch=true; //get current date @@ -446,21 +533,33 @@ app.controller('callTrackingLeadCtrl', ["$scope","$rootScope","toaster", "$filte $scope.modifyDate = moment(); $scope.modifyDate.add(30, 'days'); $scope.futureDate = $filter('date')($scope.modifyDate, 'dd-MM-yyyy'); + if(localStorage.getItem('searchObj') !='' && localStorage.getItem('searchObj') !=null && localStorage.getItem('searchObj') !=undefined){ + $scope.myModel.leadDate = $filter('date')(JSON.parse(localStorage.getItem('searchObj')).fromDate, 'dd-MM-yyyy'); + + $scope.myModel.search = JSON.parse(localStorage.getItem('searchObj')).fromDate; + localStorage.setItem('searchObj',''); + } + else{ + $scope.myModel.leadDate=$scope.currentDate; + } - $scope.myModel.leadDate=$scope.currentDate; /* * edit track details * created by kms * */ - $scope.setEditId = function (p,search1,search2,search3,search4,search5) { + $scope.setEditId = function (p,search1,search2,search3,search4,search5,fromDate) { + + $scope.changeFromDate= $filter('date')(fromDate, 'yyyy-MM-dd'); + $scope.searchData = { "searchDate": search1, "searchName": search2, 'serachActivity': search3, 'searchAssignTo': search4, 'searchStatus': search5, - 'callFrom': "lead" + 'callFrom': "lead", + 'fromDate':$scope.changeFromDate } @@ -485,13 +584,58 @@ app.controller('callTrackingLeadCtrl', ["$scope","$rootScope","toaster", "$filte } + /* + * mark call as important + * created by kms + * */ + $scope.markAsImportant = function (trackID,flag) { + + var markas = { + method: 'POST', + url: apiPoint.url + 'callAsImportantFlag/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + flag:flag, + trackId:trackID, + updatedBy: JSON.parse(localStorage.getItem('localObj')).localUserID, + branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID + } + }; + $http(markas).then(function (response) { + if (response.data.status==200 && response.data.updatedStatus) { + $scope.init($scope.myModel); + + } else { + $scope.init($scope.myModel); + + } + }); + + + } + + //from date change + $scope.checkDate = function (value) { + + + $scope.myModel.search = $filter('date')(value.leadDate, 'yyyy-MM-dd'); + + + $scope.init($scope.myModel); + + } + + + /* *get tracking list * created by kms * */ - $scope.init = function (form,myModel) { + $scope.init = function (myModel) { - if(isNaN(myModel.leadDate)){ + /* if(isNaN(myModel.leadDate)){ $scope.loadDate= $filter('date')(new Date(), 'yyyy-MM-dd'); } @@ -502,7 +646,9 @@ app.controller('callTrackingLeadCtrl', ["$scope","$rootScope","toaster", "$filte $scope.getdate=new Date(myModel.leadDate).toDateString(); $scope.loadDate = $filter('date')(new Date($scope.getdate), 'yyyy-MM-dd'); - } + + }*/ + $scope.loader = true; var getRecentlead = { @@ -512,7 +658,7 @@ app.controller('callTrackingLeadCtrl', ["$scope","$rootScope","toaster", "$filte 'Content-Type': 'application/json' }, data: { - loadDate:$scope.loadDate, + loadDate:myModel.search, requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID, requestedDept: JSON.parse(localStorage.getItem('localObj')).localType, branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID @@ -563,7 +709,9 @@ app.controller('callTrackingCloseCtrl', ["$scope","$rootScope","toaster", "$filt localStorage.setItem('searchMobile',''); $scope.myModel = { "closeDate": new Date(), + "search":$filter('date')(new Date(), 'yyyy-MM-dd') }; + $scope.hideDateSearch=true; //get current date @@ -574,23 +722,34 @@ app.controller('callTrackingCloseCtrl', ["$scope","$rootScope","toaster", "$filt $scope.modifyDate.add(30, 'days'); $scope.futureDate = $filter('date')($scope.modifyDate, 'dd-MM-yyyy'); - $scope.myModel.closeDate=$scope.currentDate; + if(localStorage.getItem('searchObj') !='' && localStorage.getItem('searchObj') !=null && localStorage.getItem('searchObj') !=undefined){ + $scope.myModel.closeDate = $filter('date')(JSON.parse(localStorage.getItem('searchObj')).fromDate, 'dd-MM-yyyy'); + $scope.myModel.search = JSON.parse(localStorage.getItem('searchObj')).fromDate; + localStorage.setItem('searchObj',''); + } + else{ + $scope.myModel.closeDate=$scope.currentDate; + } /* * edit track details * created by kms * */ - $scope.setEditId = function (p,search1,search2,search3,search4,search5) { + $scope.setEditId = function (p,search1,search2,search3,search4,search5,fromDate) { + $scope.changeFromDate= $filter('date')(fromDate, 'yyyy-MM-dd'); + $scope.searchData = { "searchDate": search1, "searchName": search2, 'serachActivity': search3, 'searchAssignTo': search4, 'searchStatus': search5, - 'callFrom': "close" + 'callFrom': "close", + 'fromDate':$scope.changeFromDate } + localStorage.setItem('searchObj', JSON.stringify($scope.searchData)); localStorage.setItem('trackID', p.TrackingID); localStorage.setItem('count', 0); @@ -609,6 +768,48 @@ app.controller('callTrackingCloseCtrl', ["$scope","$rootScope","toaster", "$filt $scope.sortKey = keyname; //set the sortKey to the param passed $scope.reverse = !$scope.reverse; //if true make it false and vice versa + } + //from date change + $scope.checkDate = function (value) { + + + $scope.myModel.search = $filter('date')(value.closeDate, 'yyyy-MM-dd'); + + + $scope.init($scope.myModel); + + } + + /* + * mark call as important + * created by kms + * */ + $scope.markAsImportant = function (trackID,flag) { + + var markas = { + method: 'POST', + url: apiPoint.url + 'callAsImportantFlag/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + flag:flag, + trackId:trackID, + updatedBy: JSON.parse(localStorage.getItem('localObj')).localUserID, + branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID + } + }; + $http(markas).then(function (response) { + if (response.data.status==200 && response.data.updatedStatus) { + $scope.init($scope.myModel); + + } else { + $scope.init($scope.myModel); + + } + }); + + } @@ -616,9 +817,9 @@ app.controller('callTrackingCloseCtrl', ["$scope","$rootScope","toaster", "$filt *get tracking list * created by kms * */ - $scope.init = function (form,myModel) { + $scope.init = function (myModel) { - if(isNaN(myModel.closeDate)){ + /* if(isNaN(myModel.closeDate)){ $scope.loadDate= $filter('date')(new Date(), 'yyyy-MM-dd'); } @@ -629,7 +830,7 @@ app.controller('callTrackingCloseCtrl', ["$scope","$rootScope","toaster", "$filt $scope.getdate=new Date(myModel.closeDate).toDateString(); $scope.loadDate = $filter('date')(new Date($scope.getdate), 'yyyy-MM-dd'); - } + }*/ $scope.loader = true; var getRecentclose = { @@ -639,7 +840,7 @@ app.controller('callTrackingCloseCtrl', ["$scope","$rootScope","toaster", "$filt 'Content-Type': 'application/json' }, data: { - loadDate:$scope.loadDate, + loadDate:myModel.search, requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID, requestedDept: JSON.parse(localStorage.getItem('localObj')).localType, branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID @@ -691,7 +892,9 @@ app.controller('callTrackingPendingCtrl', ["$scope","$rootScope","toaster", "$fi localStorage.setItem('searchMobile',''); $scope.myModel = { "pendingDate": new Date(), + "search":$filter('date')(new Date(), 'yyyy-MM-dd') }; + $scope.hideDateSearch=true; //get current date @@ -702,20 +905,32 @@ app.controller('callTrackingPendingCtrl', ["$scope","$rootScope","toaster", "$fi $scope.modifyDate.add(30, 'days'); $scope.futureDate = $filter('date')($scope.modifyDate, 'dd-MM-yyyy'); - $scope.myModel.pendingDate=$scope.currentDate; + + if(localStorage.getItem('searchObj') !='' && localStorage.getItem('searchObj') !=null && localStorage.getItem('searchObj') !=undefined){ + $scope.myModel.pendingDate = $filter('date')(JSON.parse(localStorage.getItem('searchObj')).fromDate, 'dd-MM-yyyy'); + + $scope.myModel.search = JSON.parse(localStorage.getItem('searchObj')).fromDate; + localStorage.setItem('searchObj',''); + } + else{ + $scope.myModel.pendingDate=$scope.currentDate; + } /* * edit track details * created by kms * */ - $scope.setEditId = function (p,search1,search2,search3,search4,search5) { + $scope.setEditId = function (p,search1,search2,search3,search4,search5,fromDate) { + $scope.changeFromDate= $filter('date')(fromDate, 'yyyy-MM-dd'); + $scope.searchData = { "searchDate": search1, "searchName": search2, 'serachActivity': search3, 'searchAssignTo': search4, 'searchStatus': search5, - 'callFrom': "pending" + 'callFrom': "pending", + 'fromDate':$scope.changeFromDate } @@ -738,15 +953,56 @@ app.controller('callTrackingPendingCtrl', ["$scope","$rootScope","toaster", "$fi $scope.reverse = !$scope.reverse; //if true make it false and vice versa } + /* + * mark call as important + * created by kms + * */ + $scope.markAsImportant = function (trackID,flag) { + + var markas = { + method: 'POST', + url: apiPoint.url + 'callAsImportantFlag/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + flag:flag, + trackId:trackID, + updatedBy: JSON.parse(localStorage.getItem('localObj')).localUserID, + branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID + } + }; + $http(markas).then(function (response) { + if (response.data.status==200 && response.data.updatedStatus) { + $scope.init($scope.myModel); + + } else { + $scope.init($scope.myModel); + + } + }); + + + } + //from date change + $scope.checkDate = function (value) { + + + $scope.myModel.search = $filter('date')(value.pendingDate, 'yyyy-MM-dd'); + + + $scope.init($scope.myModel); + + } /* *get tracking list * created by kms * */ - $scope.init = function (form,myModel) { + $scope.init = function (myModel) { - if(isNaN(myModel.pendingDate)){ + /* if(isNaN(myModel.pendingDate)){ $scope.loadDate= $filter('date')(new Date(), 'yyyy-MM-dd'); } @@ -757,7 +1013,7 @@ app.controller('callTrackingPendingCtrl', ["$scope","$rootScope","toaster", "$fi $scope.getdate=new Date(myModel.pendingDate).toDateString(); $scope.loadDate = $filter('date')(new Date($scope.getdate), 'yyyy-MM-dd'); - } + }*/ $scope.loader = true; var getRecentclose = { @@ -767,7 +1023,7 @@ app.controller('callTrackingPendingCtrl', ["$scope","$rootScope","toaster", "$fi 'Content-Type': 'application/json' }, data: { - loadDate:$scope.loadDate, + loadDate:myModel.search, requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID, requestedDept: JSON.parse(localStorage.getItem('localObj')).localType, branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID @@ -814,12 +1070,16 @@ app.controller('callTrackingPendingCtrl', ["$scope","$rootScope","toaster", "$fi }]); app.controller('callTrackingCtrl2', ["$scope","$rootScope","toaster", "$filter", "ngTableParams", "API_POINTS", "$localStorage", "$http", "$state", function ($scope,$rootScope,toaster, $filter, ngTableParams, apiPoint, $localStorage, $http, $state) { + + $scope.userType=JSON.parse(localStorage.getItem('localObj')).localType; + $scope.afterRefresh = function () { $rootScope.myModel1 = { "status":'', "date": '', "comments": "", + "branch":"" }; $rootScope.loadFollowupDetails(localStorage.getItem('trackID')); }; @@ -1159,7 +1419,6 @@ app.controller('callTrackingCtrl2', ["$scope","$rootScope","toaster", "$filter", * created by kms * */ $rootScope.updateFollowup = function (followupDetails,myModel1, loading) { - if(isNaN(myModel1.date)){ $scope.nextFollowupDate = myModel1.date; @@ -1173,10 +1432,25 @@ app.controller('callTrackingCtrl2', ["$scope","$rootScope","toaster", "$filter", if(myModel1.status==null || myModel1.status=='' || myModel1.status==undefined){ swal("Warning!", 'Please select status', "warning"); } + else if (myModel1.assignStaff=='') { + swal("Warning!", 'Please select assigned to', "warning"); + } else if (myModel1.comments=='') { swal("Warning!", 'Please enter comments', "warning"); } else { + + + if($scope.userType !='R004'){ + $scope.updateBranchID = JSON.parse(localStorage.getItem('localObj')).localBranchID; + + + } + else{ + $scope.updateBranchID = myModel1.branch; + + + } $rootScope.ldloading2 = {}; $rootScope.ldloading2[loading.replace('-', '_')] = true; @@ -1195,7 +1469,7 @@ app.controller('callTrackingCtrl2', ["$scope","$rootScope","toaster", "$filter", assignedTo: myModel1.assignStaff, comments: myModel1.comments, updatedBy: JSON.parse(localStorage.getItem('localObj')).localUserID, - branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID, + branchId: $scope.updateBranchID, } }; $http(update).then(function (response) { @@ -1241,8 +1515,19 @@ app.controller('callTrackingCtrl2', ["$scope","$rootScope","toaster", "$filter", $rootScope.futureDate1 = $filter('date')($scope.modifyDate1, 'dd-MM-yyyy'); // $rootScope.myModel1.status=$rootScope.followupDetails.StatusCode; $rootScope.trackingStatus=response.data.statusDetails; + $rootScope.myModel1.branch=$rootScope.followupDetails.CreatedBranch; + $rootScope.myModel1.assignStaff=$rootScope.followupDetails.AssignedTo; + $rootScope.staffArray=''; $rootScope.staffDetails=response.data.staffDetails; + angular.forEach($rootScope.staffDetails, function(item) { + if(item.BranchCode==$rootScope.myModel1.branch){ + $rootScope.staffArray = item.staffDetails; + + } + + }); + } else { swal("Failed!", response.data.message, "error"); @@ -1252,6 +1537,22 @@ app.controller('callTrackingCtrl2', ["$scope","$rootScope","toaster", "$filter", } + /* + * get staff details while change branch + * */ + $rootScope.changeBranch = function (branchCode) { + $rootScope.staffArray=""; + $rootScope.myModel1.assignStaff=""; + angular.forEach($rootScope.staffDetails, function(item) { + if(item.BranchCode==branchCode){ + $rootScope.staffArray = item.staffDetails; + $rootScope.myModel1.assignStaff=item.staffDetails[0].loginId; + + } + + }); + } + /* * cancel the page * created by kms diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js index 02f6558b..7108913c 100755 --- a/Apollo/assets/js/controllers/feesStatusCtrl.js +++ b/Apollo/assets/js/controllers/feesStatusCtrl.js @@ -360,6 +360,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n $scope.myModelInstallemt.amount=""; $scope.myModelInstallemt.date=""; $rootScope.updateMoreItems=[]; + $scope.setTotalAmount=''; form.$setPristine(true); } else { @@ -566,10 +567,44 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n $scope.myModelInstallemt.date=""; $rootScope.lastInstallemtDate=""; } + $scope.setFeesTotalAmount(model); form.$setPristine(true); } + $scope.setTotalAmount=''; + /* + * get set fees total amount + * */ + $scope.setFeesTotalAmount = function (values) { + if(values.ActualFees=='' || values.ActualFees==null || values.ActualFees==undefined){ + $scope.actFees=0; + } + else{ + $scope.actFees=values.ActualFees; + } + if(values.Others=='' || values.Others==null || values.Others==undefined){ + $scope.othersFees=0; + } + else{ + $scope.othersFees=values.Others; + } + if(values.STFOrWR=='' || values.STFOrWR==null || values.STFOrWR==undefined){ + $scope.stfFees=0; + } + else{ + $scope.stfFees=values.STFOrWR; + } + if(values.Waiver=='' || values.Waiver==null || values.Waiver==undefined){ + $scope.wiverFees=0; + } + else{ + $scope.wiverFees=values.Waiver; + } + + $scope.setTotalAmount= parseInt($scope.actFees) + parseInt($scope.stfFees) + parseInt($scope.othersFees) - parseInt($scope.wiverFees); + + } diff --git a/Apollo/assets/js/controllers/studentCtrl.js b/Apollo/assets/js/controllers/studentCtrl.js index b8fad21b..d0568b18 100755 --- a/Apollo/assets/js/controllers/studentCtrl.js +++ b/Apollo/assets/js/controllers/studentCtrl.js @@ -182,6 +182,7 @@ $scope.studentListLength = 0; $scope.setEditId = function (id) { $scope.editId = id; $scope.editCourseId = -1; + $scope.studentViewPage=-1; } $scope.setEditCourseId = function (id) { @@ -191,6 +192,20 @@ $scope.studentListLength = 0; // $scope.getStudentCourseDetails(id); $scope.editCourseId = id; $scope.editId = -1; + $scope.studentViewPage=-1; + $scope.courseEditLoading = true; + } + /* + * view student page + * created by kms + * */ + $scope.viewStudentPage = function (id) { + $scope.list = false; + $scope.getStudentPageDetails(id); + $scope.currentStudentId = id; + $scope.studentViewPage = id; + $scope.editId = -1; + $scope.editCourseId = -1; $scope.courseEditLoading = true; } @@ -198,6 +213,7 @@ $scope.studentListLength = 0; $scope.getStudentList(); $scope.editId = -1; $scope.editCourseId = -1; + $scope.studentViewPage=-1; } $scope.cancelCourseDetails = function () { @@ -836,6 +852,40 @@ $scope.studentListLength = 0; } } } + /* + * get student view details in management + * created by kms + * + * */ + $scope.getStudentPageDetails = function (id) { + var getcourse = { + method: 'POST', + url: apiPoint.url + 'getStudentBasicInfo/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + requestedBy :id, + requestedFrom: 1 + } + }; + $http(getcourse).then(function (response) { + + if (response.data.status == 200 && response.data.studentStatus== true) { + $scope.courseEditLoading = false; + $scope.studentDetails = response.data.studentDetails; + $scope.courseDetails = response.data.courseDetails; + + + } else { + $scope.courseEditLoading = false; + $scope.studentDetails = ""; + $scope.courseDetails = ""; + + } + }); + + }; }]); @@ -1057,9 +1107,11 @@ $scope.myUnivSearch = ""; $scope.editId = -1; $scope.editCourseId = -1; + $scope.studentViewPage=-1; $scope.setEditId = function (id) { $scope.editId = id; $scope.editCourseId = -1; + $scope.studentViewPage=-1; } $scope.setEditCourseId = function (id) { @@ -1069,6 +1121,20 @@ $scope.myUnivSearch = ""; // $scope.getStudentCourseDetails(id); $scope.editCourseId = id; $scope.editId = -1; + $scope.studentViewPage=-1; + $scope.courseEditLoading = true; + } + /* + * view student page + * created by kms + * */ + $scope.viewStudentPage = function (id) { + $scope.list = false; + $scope.getStudentPageDetails(id); + $scope.currentStudentId = id; + $scope.studentViewPage = id; + $scope.editId = -1; + $scope.editCourseId = -1; $scope.courseEditLoading = true; } @@ -1076,6 +1142,7 @@ $scope.myUnivSearch = ""; $scope.getStudentList(); $scope.editId = -1; $scope.editCourseId = -1; + $scope.studentViewPage = -1; } $scope.cancelCourseDetails = function () { @@ -1779,6 +1846,40 @@ $scope.myUnivSearch = ""; } } } + /* + * get student view details in management + * created by kms + * + * */ + $scope.getStudentPageDetails = function (id) { + var getcourse = { + method: 'POST', + url: apiPoint.url + 'getStudentBasicInfo/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + requestedBy :id, + requestedFrom: 1 + } + }; + $http(getcourse).then(function (response) { + + if (response.data.status == 200 && response.data.studentStatus== true) { + $scope.courseEditLoading = false; + $scope.studentDetails = response.data.studentDetails; + $scope.courseDetails = response.data.courseDetails; + + + } else { + $scope.courseEditLoading = false; + $scope.studentDetails = ""; + $scope.courseDetails = ""; + + } + }); + + }; }]); @@ -1813,6 +1914,81 @@ app.directive('fileUploadEdit', function () { scope.$emit("fileSelectedEdit", { file: files[i] }); } }); - } - }; + + + +} +}; }); +/*modal controller +* */ +app.controller('FeesModalDemoCtrl', ["$scope", "$modal", "$log", function ($scope, $modal, $log) { + //Tooltip for print button + $scope.dynamicTooltip = 'Click to View Bill Details'; + + + + // $scope.items = ['item1', 'item2', 'item3']; + + $scope.FeesName="" ; + $scope.open = function (values) { + + $scope.FeesName = values; + + var modalInstance = $modal.open({ + templateUrl: 'myModalContent.html', + controller: 'ModalInstanceCtrl', +// size: size, + resolve: { + items: function () { + return $scope.FeesName; + } + } + }); + + modalInstance.result.then(function (selectedItem) { + $scope.selected = selectedItem; + }, function () { + $log.info('Modal dismissed at: ' + new Date()); + }); + }; +}]); + +// Please note that $modalInstance represents a modal window (instance) dependency. +// It is not the same as the $modal service used above. + +app.controller('ModalInstanceCtrl', ["$scope", "$modalInstance", "items","WordsService", function ($scope, $modalInstance, items,WordsService) { + + $scope.items = items; + $scope.selected = { + item: $scope.items[0] + }; + + $scope.ok = function () { + $modalInstance.close($scope.selected.item); + }; + + $scope.cancel = function () { + $modalInstance.dismiss('cancel'); + }; + + +}]); +app.filter('unique', function() { + return function(collection, primaryKey, secondaryKey) { //optional secondary key + var output = [], + keys = []; + + angular.forEach(collection, function(item) { + var key; + secondaryKey === undefined ? key = item[primaryKey] : key = item[primaryKey][secondaryKey]; + + if(keys.indexOf(key) === -1) { + keys.push(key); + output.push(item); + } + }); + + return output; + }; +}); \ No newline at end of file diff --git a/Apollo/assets/js/controllers/studentViewCtrl.js b/Apollo/assets/js/controllers/studentViewCtrl.js index b2447f5e..76ff3bdf 100755 --- a/Apollo/assets/js/controllers/studentViewCtrl.js +++ b/Apollo/assets/js/controllers/studentViewCtrl.js @@ -20,7 +20,7 @@ app.controller('studentViewCtrl', ["$scope","$rootScope", "toaster", "$filter", }, data: { requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID, - + requestedFrom: 2 } }; $http(getcourse).then(function (response) { diff --git a/Apollo/assets/views/callTrackingCloseDetails.html b/Apollo/assets/views/callTrackingCloseDetails.html index 201e08d9..5b79a9f2 100755 --- a/Apollo/assets/views/callTrackingCloseDetails.html +++ b/Apollo/assets/views/callTrackingCloseDetails.html @@ -32,7 +32,7 @@ -
+
@@ -51,8 +51,8 @@ datepicker-options="dateOptions" placeholder="Select Date" max-date="maxDate" - close-text="Close" ng-change="init(viewForm,myModel)"/> - + close-text="Close" ng-change="checkDate(myModel)"/> +
@@ -68,6 +68,7 @@ + @@ -93,8 +94,16 @@ - - + + + + + + @@ -113,13 +122,13 @@ diff --git a/Apollo/assets/views/callTrackingDetails.html b/Apollo/assets/views/callTrackingDetails.html index 37634aa5..5e7131d8 100755 --- a/Apollo/assets/views/callTrackingDetails.html +++ b/Apollo/assets/views/callTrackingDetails.html @@ -127,7 +127,8 @@
Tracking ID
{{p.TrackingID}}
+ + + + {{p.TrackingID}} {{p.followupDetails }} {{p.LeadName}} {{p.MobileNumber}} - + {{p.statusName}} - + {{p.statusName}}
- + + @@ -152,8 +153,14 @@ - - + + + + @@ -171,13 +178,13 @@ @@ -411,13 +418,7 @@ - - - - - - -
+
-
+ +
+ +
+ +
Please Wait...
+ + +
+
+ + + + Branch is required + + +
+ +
+ + + + +
+ + + + Assigned to is required + + +
+
@@ -512,6 +583,7 @@ +
--> +
diff --git a/Apollo/assets/views/callTrackingFollowup.html b/Apollo/assets/views/callTrackingFollowup.html index a81e08c1..ce261c76 100755 --- a/Apollo/assets/views/callTrackingFollowup.html +++ b/Apollo/assets/views/callTrackingFollowup.html @@ -151,7 +151,7 @@
- + + + + + + + + + + -
+
- + close-text="Close" ng-change="checkDate(myModel)"/> +
-
+
@@ -68,6 +68,7 @@
Tracking ID
{{p.TrackingID}}
+ + + + {{p.TrackingID}} {{p.followupDetails }} {{p.LeadName}} {{p.MobileNumber}} - + {{p.statusName}} - + {{p.statusName}}
Assigned To
Select Branch + +
Assigned To + +
Status
+ @@ -93,8 +94,14 @@ - - + + + + @@ -113,13 +120,13 @@ @@ -142,4 +149,3 @@ - diff --git a/Apollo/assets/views/callTrackingPendingDetails.html b/Apollo/assets/views/callTrackingPendingDetails.html index 1df26425..5a177085 100755 --- a/Apollo/assets/views/callTrackingPendingDetails.html +++ b/Apollo/assets/views/callTrackingPendingDetails.html @@ -32,7 +32,7 @@ -
+
@@ -51,8 +51,8 @@ datepicker-options="dateOptions" placeholder="Select Date" max-date="maxDate" - close-text="Close" ng-change="init(viewForm,myModel)"/> - + close-text="Close" ng-change="checkDate(myModel)"/> +
@@ -68,6 +68,7 @@
Tracking ID
{{p.TrackingID}}
+ + + + {{p.TrackingID}} {{p.followupDetails }} {{p.LeadName}} {{p.MobileNumber}} - + {{p.statusName}} - + {{p.statusName}}
+ @@ -93,8 +94,14 @@ - - + + + + @@ -113,13 +120,13 @@ - diff --git a/Apollo/assets/views/status-update/setFeesForStudent.html b/Apollo/assets/views/status-update/setFeesForStudent.html index f4d0a368..18b93cba 100755 --- a/Apollo/assets/views/status-update/setFeesForStudent.html +++ b/Apollo/assets/views/status-update/setFeesForStudent.html @@ -89,7 +89,7 @@ + ng-model="setModel.feesType.STFOrWR" ng-pattern="/^[0-9]*$/" ng-change="setFeesTotalAmount(setModel.feesType);" ng-disabled="setModel.feesType.ExistValue=='1' && userType!='R004'"/> STF/WR amount is required @@ -105,7 +105,7 @@ + ng-model="setModel.feesType.Others" ng-pattern="/^[0-9]*$/" ng-change="setFeesTotalAmount(setModel.feesType);" ng-disabled="setModel.feesType.ExistValue=='1' && userType!='R004'"/> Others amount is required @@ -114,22 +114,7 @@ - diff --git a/Apollo/assets/views/student/studentViewInManagement.html b/Apollo/assets/views/student/studentViewInManagement.html new file mode 100644 index 00000000..63e5fec3 --- /dev/null +++ b/Apollo/assets/views/student/studentViewInManagement.html @@ -0,0 +1,642 @@ + + + + + + + +
+
+ + + + + + + + + + +
+
+
+ +

Fetching ...

+
+
+ +
+ + Student Status Details + +
+
+
Tracking ID
{{p.TrackingID}}
+ + + + {{p.TrackingID}} {{p.followupDetails }} {{p.LeadName}} {{p.MobileNumber}} - + {{p.statusName}} - + + {{p.statusName}}
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
Fees NameSession NameRoll NumberTotal Payable FeesPaid FeesBalance Fees
+ {{fees.FeesName}} + {{fees.SessionName}} + {{fees.RollNo}} + {{fees.PayableAmount}} + {{fees.PaidBillAmount}} + {{fees.BalanceAmount}} + + + +
+ + + +
+ + + + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + +
Document NameStatusComments
+ {{cert.CertificateName}} + + {{cert.ListName}}   ON   {{cert.AppDate}} + + {{cert.Comments}} +
+ + + +
+ + + + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + +
TypeStatusComments
+ {{mark.Sem_Year}} + + {{mark.ListName}}   ON   {{mark.CDate}} + + {{mark.Comments}} +
+ + + +
+ + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + +
TypeStatusComments
+ {{study.Sem_Year}} + {{study.ListName}}   ON   {{study.SDate}} + + {{study.Comments}}
+ + + +
+ + + + +
+
+
+ + +
+
+
+ + +
+
+
+ + + + + + + + \ No newline at end of file diff --git a/Apollo/assets/views/student/student_details.html b/Apollo/assets/views/student/student_details.html index 0da7d287..c513375e 100755 --- a/Apollo/assets/views/student/student_details.html +++ b/Apollo/assets/views/student/student_details.html @@ -170,9 +170,21 @@ - {{p.MobileNumber}} - {{p.Firstname}} {{p.Lastname}} + + + {{p.MobileNumber}} + + + + + + + {{p.Firstname}} {{p.Lastname}} + + + {{p.Fathername}} + ACTIVE DEACTIVE
{{p.Comments}}
@@ -188,6 +200,9 @@ + + + diff --git a/Apollo/assets/views/student/student_details_SuperAdmin.html b/Apollo/assets/views/student/student_details_SuperAdmin.html index 7cca453f..5ca17dba 100644 --- a/Apollo/assets/views/student/student_details_SuperAdmin.html +++ b/Apollo/assets/views/student/student_details_SuperAdmin.html @@ -10,7 +10,7 @@
- +
-
-
+
+
- +
Loading...
-
-
+
+

- +
@@ -111,7 +111,7 @@


- +
@@ -195,8 +195,18 @@ - {{p.MobileNumber}} - {{p.Firstname}} {{p.Lastname}} + + + {{p.MobileNumber}} + + + + + + {{p.Firstname}} {{p.Lastname}} + + + {{p.Fathername}} ACTIVE DEACTIVE @@ -213,6 +223,9 @@ + + + @@ -468,7 +481,7 @@