Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec
This commit is contained in:
resicovenba
commit
9fe7b2b2cb
@ -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
|
||||
|
||||
@ -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
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@ -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;
|
||||
|
||||
}
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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);
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
@ -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;
|
||||
};
|
||||
});
|
||||
@ -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) {
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
</section>
|
||||
<!-- end: PAGE TITLE -->
|
||||
<!-- start: LIST GROUP -->
|
||||
<div class="container-fluid container-fullw bg-white" ng-controller="callTrackingCloseCtrl" data-ng-init="init(viewForm,myModel)">
|
||||
<div class="container-fluid container-fullw bg-white" ng-controller="callTrackingCloseCtrl" data-ng-init="init(myModel)">
|
||||
<div class="row">
|
||||
<div class="row">
|
||||
<div data-ng-controller="DatepickerDemoCtrl">
|
||||
@ -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)"/>
|
||||
<input class="form-control" type="text" ng-model="myModel.search" id="search" autofocus placeholder="Search Date" ng-hide="hideDateSearch==true" />
|
||||
</div>
|
||||
|
||||
|
||||
@ -68,6 +68,7 @@
|
||||
<table class="table table-hover">
|
||||
<thead>
|
||||
<tr >
|
||||
<th></th>
|
||||
<th ng-click="sort('TrackingID')">Tracking ID
|
||||
<span class="glyphicon sort-icon" ng-show="sortKey=='TrackingID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
||||
</th>
|
||||
@ -93,8 +94,16 @@
|
||||
</tr>
|
||||
</thead>
|
||||
<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 ng-click="setEditId(p,'','','','','');">
|
||||
<td><a class="text-orange" ng-click="setEditId(p,'','','','','');">{{p.TrackingID}}</a></td>
|
||||
<tr>
|
||||
|
||||
<td ng-if="p.Flag==false">
|
||||
<a class="glyphicon ng-scope fa margin-right-5 fa-thumbs-o-up text-grey text-extra-large" tooltip="Important" ng-click="markAsImportant(p.TrackingID,true);"></a>
|
||||
</td>
|
||||
<td ng-if="p.Flag==true">
|
||||
<a class="glyphicon ng-scope fa margin-right-5 fa-thumbs-o-up text-purple text-extra-large" tooltip="Important" ng-click="markAsImportant(p.TrackingID,false);"></a>
|
||||
</td>
|
||||
|
||||
<td><a class="text-orange" ng-click="setEditId(p,'','','','','',myModel.search);">{{p.TrackingID}}</a></td>
|
||||
<td>{{p.followupDetails }}</td>
|
||||
<td>{{p.LeadName}}</td>
|
||||
<td>{{p.MobileNumber}}</td>
|
||||
@ -113,13 +122,13 @@
|
||||
|
||||
<td ng-if="p.statusName!='CLOSE'">
|
||||
|
||||
<a class="text-dark" tooltip="Click To View">
|
||||
<a class="text-dark" tooltip="Click To View" ng-click="setEditId(p,'','','','','',myModel.search);">
|
||||
<span class="label label-sm label-warning"> {{p.statusName}} </span>
|
||||
</a>
|
||||
|
||||
<!--<span class="label label-sm label-warning">{{p.statusName}}</span>--></td>
|
||||
<td ng-if="p.statusName=='CLOSE'">
|
||||
<a class="text-dark" tooltip="Click To View">
|
||||
<a class="text-dark" tooltip="Click To View" ng-click="setEditId(p,'','','','','',myModel.search);">
|
||||
<span class="label label-sm label-success"> {{p.statusName}} </span>
|
||||
</a>
|
||||
<!--<span class="label label-sm label-success">{{p.statusName}}</span>--></td>
|
||||
|
||||
@ -127,7 +127,8 @@
|
||||
|
||||
<table class="table table-hover">
|
||||
<thead>
|
||||
<tr >
|
||||
<tr>
|
||||
<th></th>
|
||||
<th ng-click="sort('TrackingID')">Tracking ID
|
||||
<span class="glyphicon sort-icon" ng-show="sortKey=='TrackingID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
||||
</th>
|
||||
@ -152,8 +153,14 @@
|
||||
</tr>
|
||||
</thead>
|
||||
<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 ng-click="setEditId(p,search,search2,search3.ActivityName,search4.Firstname,search5.statusName);">
|
||||
<td><a class="text-orange" ng-click="setEditId(p,search,search2,search3.ActivityName,search4.Firstname,search5.statusName);">{{p.TrackingID}}</a></td>
|
||||
<tr>
|
||||
<td ng-if="p.Flag==false">
|
||||
<a class="glyphicon ng-scope fa margin-right-5 fa-thumbs-o-up text-grey text-extra-large" tooltip="Important" ng-click="markAsImportant(p.TrackingID,true);"></a>
|
||||
</td>
|
||||
<td ng-if="p.Flag==true">
|
||||
<a class="glyphicon ng-scope fa margin-right-5 fa-thumbs-o-up text-purple text-extra-large" tooltip="Important" ng-click="markAsImportant(p.TrackingID,false);"></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.LeadName}}</td>
|
||||
<td>{{p.MobileNumber}}</td>
|
||||
@ -171,13 +178,13 @@
|
||||
|
||||
<td ng-if="p.statusName!='CLOSE'">
|
||||
|
||||
<a class="text-dark" tooltip="Click To View">
|
||||
<a class="text-dark" tooltip="Click To View" ng-click="setEditId(p,search,search2,search3.ActivityName,search4.Firstname,search5.statusName,myModel.search,myModel.dateTo);">
|
||||
<span class="label label-sm label-warning"> {{p.statusName}} </span>
|
||||
</a>
|
||||
|
||||
<!--<span class="label label-sm label-warning">{{p.statusName}}</span>--></td>
|
||||
<td ng-if="p.statusName=='CLOSE'">
|
||||
<a class="text-dark" tooltip="Click To View">
|
||||
<a class="text-dark" tooltip="Click To View" ng-click="setEditId(p,search,search2,search3.ActivityName,search4.Firstname,search5.statusName,myModel.search,myModel.dateTo);">
|
||||
<span class="label label-sm label-success"> {{p.statusName}} </span>
|
||||
</a>
|
||||
<!--<span class="label label-sm label-success">{{p.statusName}}</span>--></td>
|
||||
@ -411,13 +418,7 @@
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="col-md-3" ng-if="loading==true">
|
||||
<div class="col-md-3" ng-if="loading==true && userType !='R004'">
|
||||
<spinner name="html5spinner">
|
||||
<div class="overlay"></div>
|
||||
<div class="spinner">
|
||||
@ -428,7 +429,7 @@
|
||||
</spinner>
|
||||
|
||||
</div>
|
||||
<div class="col-md-3 form-group" ng-if="loading==false"
|
||||
<div class="col-md-3 form-group" ng-if="loading==false && userType !='R004'"
|
||||
ng-class="{'has-error':Form.assigned.$dirty && Form.assigned.$invalid, 'has-success':Form.assigned.$valid}">
|
||||
<label >
|
||||
Assigned To <span
|
||||
@ -449,8 +450,77 @@
|
||||
<!--ng-if="Form.assigned.$valid && myModel.assigned.length!=0">Thank You</span>-->
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-md-3" ng-if="loading==true && userType =='R004'">
|
||||
<spinner name="html5spinner">
|
||||
<div class="overlay"></div>
|
||||
<div class="spinner">
|
||||
<div class="double-bounce1"></div>
|
||||
<div class="double-bounce2"></div>
|
||||
</div>
|
||||
<div class="please-wait">Please Wait...</div>
|
||||
</spinner>
|
||||
|
||||
</div>
|
||||
<div class="col-md-3 form-group" ng-if="loading==false && userType =='R004'"
|
||||
ng-class="{'has-error':Form.branch.$dirty && Form.branch.$invalid, 'has-success':Form.branch.$valid}">
|
||||
<label >
|
||||
Select Branch <span
|
||||
class="symbol required"></span>
|
||||
</label>
|
||||
|
||||
<select class="form-control" name="branch" id="Box15" tabindex="8"
|
||||
ng-model="myModel.branch"
|
||||
ng-options="brn.BranchName for brn in staffDetails"
|
||||
required>
|
||||
|
||||
<option value=""> Select Branch</option>
|
||||
|
||||
</select>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.branch.$dirty && Form.branch.$error.required && myModel.branch.length==0">Branch is required</span>
|
||||
<!--<span class="success text-small block"-->
|
||||
<!--ng-if="Form.assigned.$valid && myModel.assigned.length!=0">Thank You</span>-->
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
<div class="row">
|
||||
|
||||
|
||||
<!-- <div class="col-md-3" ng-if="loading==true && userType =='R004'">
|
||||
<spinner name="html5spinner">
|
||||
<div class="overlay"></div>
|
||||
<div class="spinner">
|
||||
<div class="double-bounce1"></div>
|
||||
<div class="double-bounce2"></div>
|
||||
</div>
|
||||
<div class="please-wait">Please Wait...</div>
|
||||
</spinner>
|
||||
|
||||
</div>-->
|
||||
|
||||
<div class="col-md-3 form-group" ng-if="userType =='R004'"
|
||||
ng-class="{'has-error':Form.assigned.$dirty && Form.assigned.$invalid, 'has-success':Form.assigned.$valid}">
|
||||
<label >
|
||||
Assigned To <span
|
||||
class="symbol required"></span>
|
||||
</label>
|
||||
|
||||
<select class="form-control" name="assigned" id="Box28" tabindex="8"
|
||||
ng-model="myModel.assignedTo"
|
||||
ng-options="emp.loginId as emp.staffName for emp in myModel.branch.staffDetails"
|
||||
required>
|
||||
|
||||
<option value=""> Select Assigned To</option>
|
||||
|
||||
</select>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.assigned.$dirty && Form.assigned.$error.required && myModel.assignedTo.length==0">Assigned to is required</span>
|
||||
<!--<span class="success text-small block"-->
|
||||
<!--ng-if="Form.assigned.$valid && myModel.assigned.length!=0">Thank You</span>-->
|
||||
</div>
|
||||
|
||||
<div class="col-md-3 form-group"
|
||||
ng-class="{'has-error':Form.altermobilenumber.$dirty && Form.altermobilenumber.$invalid, 'has-success':Form.altermobilenumber.$valid}">
|
||||
<label class="control-label">
|
||||
@ -466,6 +536,7 @@
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.altermobilenumber.$error.maxlength || Form.altermobilenumber.$error.minlength || Form.altermobilenumber.$error.pattern">Enter a valid phone number</span>
|
||||
|
||||
|
||||
</div>
|
||||
<div class="col-md-3 form-group"
|
||||
ng-class="{'has-error':Form.refered.$dirty && Form.refered.$invalid, 'has-success':Form.refered.$valid}">
|
||||
@ -512,6 +583,7 @@
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="col-md-12">
|
||||
<div class="pull-right">
|
||||
<button tabindex="13" type="submit" ladda="ldloading1.zoom_in" class="btn btn-wide btn-success" data-style="zoom-in">
|
||||
@ -521,9 +593,10 @@
|
||||
Submit
|
||||
</button>-->
|
||||
<button type="reset" class="btn btn-warning btn-wide" tabindex="14"
|
||||
ng-click="branchForm.reset(Form)">
|
||||
ng-click="trackForm.reset(Form);Form.$setPristine()">
|
||||
Reset
|
||||
</button>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</fieldset>
|
||||
|
||||
@ -151,7 +151,7 @@
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<tr ng-if="userType != 'R004'">
|
||||
<td>Assigned To</td>
|
||||
<td>
|
||||
<select class="form-control" name="status" id="Box4" tabindex="1"
|
||||
@ -164,6 +164,33 @@
|
||||
</select>
|
||||
</td>
|
||||
</tr>
|
||||
<tr ng-if="userType == 'R004'">
|
||||
<td>Select Branch</td>
|
||||
<td>
|
||||
<select class="form-control" name="status" id="Box43" tabindex="1"
|
||||
ng-model="myModel1.branch"
|
||||
ng-options="checkBranch.BranchCode as checkBranch.BranchName for checkBranch in staffDetails" ng-change="changeBranch(myModel1.branch);"
|
||||
required>
|
||||
|
||||
<!-- <option value="">Select Status</option>-->
|
||||
|
||||
</select>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr ng-if="userType == 'R004'">
|
||||
<td>Assigned To</td>
|
||||
<td>
|
||||
<select class="form-control" name="status" id="Box44" tabindex="2"
|
||||
ng-model="myModel1.assignStaff"
|
||||
ng-options="checkStaf.loginId as checkStaf.staffName for checkStaf in staffArray"
|
||||
required>
|
||||
|
||||
<!-- <option value="">Select</option>-->
|
||||
|
||||
</select>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Status</td>
|
||||
<!--
|
||||
|
||||
@ -32,13 +32,13 @@
|
||||
</section>
|
||||
<!-- end: PAGE TITLE -->
|
||||
<!-- start: LIST GROUP -->
|
||||
<div class="container-fluid container-fullw bg-white" ng-controller="callTrackingLeadCtrl" data-ng-init="init(viewForm,myModel)">
|
||||
<div class="container-fluid container-fullw bg-white" ng-controller="callTrackingLeadCtrl" data-ng-init="init(myModel)">
|
||||
<div class="row">
|
||||
<div class="row">
|
||||
<div data-ng-controller="DatepickerDemoCtrl">
|
||||
<div class="col-md-3 form-group">
|
||||
<label>
|
||||
Select Date
|
||||
Select Date
|
||||
</label>
|
||||
<input type="text"
|
||||
class="form-control "
|
||||
@ -51,14 +51,14 @@
|
||||
datepicker-options="dateOptions"
|
||||
placeholder="Select Date"
|
||||
max-date="maxDate"
|
||||
close-text="Close" ng-change="init(viewForm,myModel)"/>
|
||||
|
||||
close-text="Close" ng-change="checkDate(myModel)"/>
|
||||
<input class="form-control" type="text" ng-model="myModel.search" id="search" autofocus placeholder="Search Date" ng-hide="hideDateSearch==true" />
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="table-responsive">
|
||||
|
||||
@ -68,6 +68,7 @@
|
||||
<table class="table table-hover">
|
||||
<thead>
|
||||
<tr >
|
||||
<th></th>
|
||||
<th ng-click="sort('TrackingID')">Tracking ID
|
||||
<span class="glyphicon sort-icon" ng-show="sortKey=='TrackingID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
||||
</th>
|
||||
@ -93,8 +94,14 @@
|
||||
</tr>
|
||||
</thead>
|
||||
<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 ng-click="setEditId(p,'','','','','');">
|
||||
<td><a class="text-orange" ng-click="setEditId(p,'','','','','');">{{p.TrackingID}}</a></td>
|
||||
<tr>
|
||||
<td ng-if="p.Flag==false">
|
||||
<a class="glyphicon ng-scope fa margin-right-5 fa-thumbs-o-up text-grey text-extra-large" tooltip="Important" ng-click="markAsImportant(p.TrackingID,true);"></a>
|
||||
</td>
|
||||
<td ng-if="p.Flag==true">
|
||||
<a class="glyphicon ng-scope fa margin-right-5 fa-thumbs-o-up text-purple text-extra-large" tooltip="Important" ng-click="markAsImportant(p.TrackingID,false);"></a>
|
||||
</td>
|
||||
<td><a class="text-orange" ng-click="setEditId(p,'','','','','',myModel.search);">{{p.TrackingID}}</a></td>
|
||||
<td>{{p.followupDetails }}</td>
|
||||
<td>{{p.LeadName}}</td>
|
||||
<td>{{p.MobileNumber}}</td>
|
||||
@ -113,13 +120,13 @@
|
||||
|
||||
<td ng-if="p.statusName!='CLOSE'">
|
||||
|
||||
<a class="text-dark" tooltip="Click To View">
|
||||
<a class="text-dark" tooltip="Click To View" ng-click="setEditId(p,'','','','','',myModel.search);">
|
||||
<span class="label label-sm label-warning"> {{p.statusName}} </span>
|
||||
</a>
|
||||
|
||||
<!--<span class="label label-sm label-warning">{{p.statusName}}</span>--></td>
|
||||
<td ng-if="p.statusName=='CLOSE'">
|
||||
<a class="text-dark" tooltip="Click To View">
|
||||
<a class="text-dark" tooltip="Click To View" ng-click="setEditId(p,'','','','','',myModel.search);">
|
||||
<span class="label label-sm label-success"> {{p.statusName}} </span>
|
||||
</a>
|
||||
<!--<span class="label label-sm label-success">{{p.statusName}}</span>--></td>
|
||||
@ -142,4 +149,3 @@
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
</section>
|
||||
<!-- end: PAGE TITLE -->
|
||||
<!-- start: LIST GROUP -->
|
||||
<div class="container-fluid container-fullw bg-white" ng-controller="callTrackingPendingCtrl" data-ng-init="init(viewForm,myModel)">
|
||||
<div class="container-fluid container-fullw bg-white" ng-controller="callTrackingPendingCtrl" data-ng-init="init(myModel)">
|
||||
<div class="row">
|
||||
<div class="row">
|
||||
<div data-ng-controller="DatepickerDemoCtrl">
|
||||
@ -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)"/>
|
||||
<input class="form-control" type="text" ng-model="myModel.search" id="search" autofocus placeholder="Search Date" ng-hide="hideDateSearch==true" />
|
||||
</div>
|
||||
|
||||
|
||||
@ -68,6 +68,7 @@
|
||||
<table class="table table-hover">
|
||||
<thead>
|
||||
<tr >
|
||||
<th></th>
|
||||
<th ng-click="sort('TrackingID')">Tracking ID
|
||||
<span class="glyphicon sort-icon" ng-show="sortKey=='TrackingID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
||||
</th>
|
||||
@ -93,8 +94,14 @@
|
||||
</tr>
|
||||
</thead>
|
||||
<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 ng-click="setEditId(p,'','','','','');">
|
||||
<td><a class="text-orange" ng-click="setEditId(p,'','','','','');">{{p.TrackingID}}</a></td>
|
||||
<tr>
|
||||
<td ng-if="p.Flag==false">
|
||||
<a class="glyphicon ng-scope fa margin-right-5 fa-thumbs-o-up text-grey text-extra-large" tooltip="Important" ng-click="markAsImportant(p.TrackingID,true);"></a>
|
||||
</td>
|
||||
<td ng-if="p.Flag==true">
|
||||
<a class="glyphicon ng-scope fa margin-right-5 fa-thumbs-o-up text-purple text-extra-large" tooltip="Important" ng-click="markAsImportant(p.TrackingID,false);"></a>
|
||||
</td>
|
||||
<td><a class="text-orange" ng-click="setEditId(p,'','','','','',myModel.search);">{{p.TrackingID}}</a></td>
|
||||
<td>{{p.followupDetails }}</td>
|
||||
<td>{{p.LeadName}}</td>
|
||||
<td>{{p.MobileNumber}}</td>
|
||||
@ -113,13 +120,13 @@
|
||||
|
||||
<td ng-if="p.statusName!='CLOSE'">
|
||||
|
||||
<a class="text-dark" tooltip="Click To View">
|
||||
<a class="text-dark" tooltip="Click To View" ng-click="setEditId(p,'','','','','',myModel.search);">
|
||||
<span class="label label-sm label-warning"> {{p.statusName}} </span>
|
||||
</a>
|
||||
|
||||
<!--<span class="label label-sm label-warning">{{p.statusName}}</span>--></td>
|
||||
<td ng-if="p.statusName=='CLOSE'">
|
||||
<a class="text-dark" tooltip="Click To View">
|
||||
<td ng-if="p.statusName=='CLOSE'" >
|
||||
<a class="text-dark" tooltip="Click To View" ng-click="setEditId(p,'','','','','',myModel.search);">
|
||||
<span class="label label-sm label-success"> {{p.statusName}} </span>
|
||||
</a>
|
||||
<!--<span class="label label-sm label-success">{{p.statusName}}</span>--></td>
|
||||
|
||||
@ -89,7 +89,7 @@
|
||||
|
||||
<input type="text" placeholder="Enter STF/WR Amount"
|
||||
autofocus tabindex="11" class="form-control" name="STF" id="STF" ng-maxlength="9"
|
||||
ng-model="setModel.feesType.STFOrWR" ng-pattern="/^[0-9]*$/" ng-disabled="setModel.feesType.ExistValue=='1' && userType!='R004'"/>
|
||||
ng-model="setModel.feesType.STFOrWR" ng-pattern="/^[0-9]*$/" ng-change="setFeesTotalAmount(setModel.feesType);" ng-disabled="setModel.feesType.ExistValue=='1' && userType!='R004'"/>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.STF.$dirty && Form.STF.$invalid"
|
||||
ng-hide="Form.STF.$error.maxlength || Form.STF.$error.pattern">STF/WR amount is required</span>
|
||||
@ -105,7 +105,7 @@
|
||||
|
||||
<input type="text" placeholder="Enter Other Amount"
|
||||
autofocus tabindex="12" class="form-control" name="others" id="others" ng-maxlength="9"
|
||||
ng-model="setModel.feesType.Others" ng-pattern="/^[0-9]*$/" ng-disabled="setModel.feesType.ExistValue=='1' && userType!='R004'"/>
|
||||
ng-model="setModel.feesType.Others" ng-pattern="/^[0-9]*$/" ng-change="setFeesTotalAmount(setModel.feesType);" ng-disabled="setModel.feesType.ExistValue=='1' && userType!='R004'"/>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.others.$dirty && Form.others.$invalid"
|
||||
ng-hide="Form.others.$error.maxlength || Form.others.$error.pattern">Others amount is required</span>
|
||||
@ -114,22 +114,7 @@
|
||||
|
||||
</div>
|
||||
|
||||
<!-- <div class="col-md-4 form-group"
|
||||
ng-class="{'has-error':Form.total.$dirty && Form.total.$invalid}">
|
||||
<label>
|
||||
Total Fees</span>
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter Total Amount"
|
||||
autofocus tabindex="13" class="form-control" name="total" id="total" ng-maxlength="9"
|
||||
ng-model="setModel.total" ng-pattern="/^[0-9]*$/"/>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.total.$dirty && Form.total.$invalid"
|
||||
ng-hide="Form.total.$error.maxlength || Form.total.$error.pattern">Total amount is required</span>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.total.$error.maxlength || Form.total.$error.pattern">Enter a valid amount</span>
|
||||
|
||||
</div>-->
|
||||
<!-- <div class="col-md-4 form-group"
|
||||
ng-class="{'has-error':Form.paid.$dirty && Form.total.$invalid}">
|
||||
<label>
|
||||
@ -152,7 +137,7 @@
|
||||
|
||||
<input type="text" placeholder="Enter Waiver Amount"
|
||||
autofocus tabindex="13" class="form-control" name="waiver" id="waiver" ng-maxlength="9"
|
||||
ng-model="setModel.feesType.Waiver" ng-pattern="/^[0-9]*$/" ng-disabled="setModel.feesType.ExistValue=='1' && userType!='R004'"/>
|
||||
ng-model="setModel.feesType.Waiver" ng-pattern="/^[0-9]*$/" ng-change="setFeesTotalAmount(setModel.feesType);" ng-disabled="setModel.feesType.ExistValue=='1' && userType!='R004'"/>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.waiver.$dirty && Form.waiver.$invalid"
|
||||
ng-hide="Form.waiver.$error.maxlength || Form.waiver.$error.pattern">Waiver amount is required</span>
|
||||
@ -160,6 +145,22 @@
|
||||
ng-if="Form.waiver.$error.maxlength || Form.waiver.$error.pattern">Enter a valid amount</span>
|
||||
|
||||
</div>
|
||||
<div class="col-md-3 form-group"
|
||||
ng-class="{'has-error':Form.total.$dirty && Form.total.$invalid}">
|
||||
<label>
|
||||
Total Fees</span>
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter Total Amount"
|
||||
autofocus tabindex="14" class="form-control" name="total" id="total" ng-maxlength="9"
|
||||
ng-model="setTotalAmount" ng-pattern="/^[0-9]*$/" readonly/>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.total.$dirty && Form.total.$invalid"
|
||||
ng-hide="Form.total.$error.maxlength || Form.total.$error.pattern">Total amount is required</span>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.total.$error.maxlength || Form.total.$error.pattern">Enter a valid amount</span>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
|
||||
@ -358,7 +358,7 @@
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="cert in course.applicationDetails">
|
||||
<tr ng-repeat="cert in course.applicationDetails | unique:'CertificateName'">
|
||||
<!-- <td>
|
||||
<span>{{cert.Sem_Year}}</span>
|
||||
</td>-->
|
||||
|
||||
642
Apollo/assets/views/student/studentViewInManagement.html
Normal file
642
Apollo/assets/views/student/studentViewInManagement.html
Normal file
@ -0,0 +1,642 @@
|
||||
<style>
|
||||
.modal-backdrop {
|
||||
background-color: #000;
|
||||
bottom: 0;
|
||||
position: fixed;
|
||||
}
|
||||
.modal-backdrop.in {
|
||||
opacity: 0.4;
|
||||
}
|
||||
|
||||
.modal-backdrop {
|
||||
z-index: 9998 !important;
|
||||
}
|
||||
|
||||
.modal {
|
||||
z-index: 9999 !important;
|
||||
}
|
||||
|
||||
.modal-content {
|
||||
background: #ffffff;
|
||||
box-shadow: none;
|
||||
width: 80%;
|
||||
margin-left: 30%;
|
||||
margin-top: 10%;
|
||||
}
|
||||
|
||||
.modal-footer, .modal-header {
|
||||
border-color: #b5b5b5;
|
||||
}
|
||||
.fa {
|
||||
color:#0095C8;
|
||||
}
|
||||
a {
|
||||
color: #5b5b60;
|
||||
}
|
||||
</style>
|
||||
<!-- start: DASHBOARD TITLE -->
|
||||
<!--<section id="page-title" class="padding-top-15 padding-bottom-15">
|
||||
<div class="row">
|
||||
<div class="col-sm-7">
|
||||
<h1 class="mainTitle" translate="dashboard.WELCOME" translate-values="{ appName: app.name }">{{ mainTitle }}</h1>
|
||||
<span class="mainDescription"></span>
|
||||
</div>
|
||||
</div>
|
||||
</section>-->
|
||||
<!-- end: DASHBOARD TITLE -->
|
||||
<!-- start: FEATURED BOX LINKS -->
|
||||
<!--<div class="container-fluid container-fullw bg-white">
|
||||
|
||||
<div class="row" ng-repeat="course in courseDetails.courseStatus">
|
||||
<div class="col-md-12">
|
||||
<div class="panel panel-white" id="panel2">
|
||||
<div class="panel-heading">
|
||||
<div class="clearfix padding-5 space5" >
|
||||
|
||||
<div class="col-xs-3 text-center no-padding">
|
||||
<!–
|
||||
<h4 class="panel-title text-purple">{{course.UniversityName}} / {{course.CourseName}}</h4>
|
||||
–>
|
||||
<a class="panel-title text-blue" tooltip="University">
|
||||
{{course.UniversityName}}
|
||||
</a>
|
||||
</div>
|
||||
<div class="col-xs-3 text-center no-padding">
|
||||
<a class="text-blue">
|
||||
Course : {{course.CourseName}}
|
||||
</a>
|
||||
</div>
|
||||
<div class="col-xs-3 text-center no-padding">
|
||||
<a class="text-blue">
|
||||
Enrollment ID : {{course.EnrollmentID}}
|
||||
</a>
|
||||
</div>
|
||||
<div class="col-xs-3 text-center no-padding">
|
||||
<a class="text-blue">
|
||||
Batch Name : {{course.BatchName}}
|
||||
</a>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
<ct-paneltool class="panel-tools" tool-collapse="tool-collapse">
|
||||
|
||||
</ct-paneltool>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<div collapse="panel2" ng-init="panel2=true" class="panel-wrapper">
|
||||
<div class="panel-body">
|
||||
|
||||
|
||||
<tabset class="tabbable">
|
||||
|
||||
|
||||
<tab heading="Fees Details" id="fees">
|
||||
<div class="panel-scroll height-200 ng-scope ps-container ps-theme-default ps-active-y" perfect-scrollbar="" wheel-propagation="false" suppress-scroll-x="true" data-ps-id="6fc3054c-6292-144d-eff7-cd557f527468">
|
||||
<div ng-if="course.feesDetails==false">
|
||||
<!– <center>
|
||||
<h5 class="text-dark">No Fees Details!</h5>
|
||||
</center>–>
|
||||
</div>
|
||||
<table class="table no-margin ng-scope" ng-controller="FeesModalDemoCtrl" ng-if="course.feesDetails!=false">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Fees Name</th>
|
||||
<th>Session Name</th>
|
||||
<th>Roll Number</th>
|
||||
<th>Total Payable Fees</th>
|
||||
<th>Paid Fees</th>
|
||||
<th>Balance Fees</th>
|
||||
<th></th>
|
||||
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="fees in course.feesDetails">
|
||||
<td>
|
||||
<span>{{fees.FeesName}}</span></td>
|
||||
<td>
|
||||
<span>{{fees.SessionName}}</span></td>
|
||||
<td>
|
||||
<span>{{fees.RollNo}}</span></td>
|
||||
<td>
|
||||
<span>{{fees.PayableAmount}}</span></td>
|
||||
<td>
|
||||
<span>{{fees.PaidBillAmount}}</span></td>
|
||||
<td>
|
||||
<span>{{fees.BalanceAmount}}</span></td>
|
||||
<td><span>
|
||||
<a tooltip="{{dynamicTooltip}}">
|
||||
<i class="fa fa-eye" ng-click="open(fees)"></i>
|
||||
</a> </span>
|
||||
</td>
|
||||
</tr>
|
||||
<script type="text/ng-template" id="myModalContent.html">
|
||||
|
||||
<div class="modal-header">
|
||||
<h4 class="modal-title">{{items.FeesName}} Details</h4>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<table class="table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Bill NO</th>
|
||||
<th>Bill Amount</th>
|
||||
<th>Bill Date</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="v in items.paidDetails">
|
||||
<td>{{v.BillNO}}</td>
|
||||
<td>{{v.BillAmount}}</td>
|
||||
<td>{{v.BillDate}}</td>
|
||||
|
||||
</tr>
|
||||
|
||||
</table>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button class="btn btn-danger btn-sm" ng-click="cancel()">Cancel</button>
|
||||
</div>
|
||||
</script>
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<!–
|
||||
view tab end
|
||||
–>
|
||||
|
||||
</div>
|
||||
|
||||
</tab>
|
||||
|
||||
<tab heading="Document Details" id="document">
|
||||
<div class="panel-scroll height-200 ng-scope ps-container ps-theme-default ps-active-y" perfect-scrollbar="" wheel-propagation="false" suppress-scroll-x="true" data-ps-id="6fc3054c-6292-144d-eff7-cd557f527468">
|
||||
<div ng-if="course.applicationDetails==false">
|
||||
<!–<center>
|
||||
<h5 class="text-dark">No Document Details!</h5>
|
||||
</center>–>
|
||||
</div>
|
||||
<table class="table no-margin ng-scope" ng-if="course.applicationDetails!=false">
|
||||
<thead>
|
||||
<tr>
|
||||
<!– <th>Type</th>–>
|
||||
<th>Document Name</th>
|
||||
<th>Status</th>
|
||||
<th>Comments</th>
|
||||
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="cert in course.applicationDetails | unique:'CertificateName'">
|
||||
<!– <td>
|
||||
<span>{{cert.Sem_Year}}</span>
|
||||
</td>–>
|
||||
<td>
|
||||
<span>{{cert.CertificateName}}</span>
|
||||
</td>
|
||||
<td>
|
||||
<span>{{cert.ListName}} </span><span> ON </span> <span>{{cert.AppDate}}</span>
|
||||
</td>
|
||||
<td>
|
||||
<span>{{cert.Comments}}</span>
|
||||
</td>
|
||||
|
||||
|
||||
</tr>
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<!–
|
||||
view tab end
|
||||
–>
|
||||
|
||||
</div>
|
||||
</tab>
|
||||
|
||||
|
||||
<tab heading="Mark Card Details" id="mark">
|
||||
<div class="panel-scroll height-200 ng-scope ps-container ps-theme-default ps-active-y" perfect-scrollbar="" wheel-propagation="false" suppress-scroll-x="true" data-ps-id="6fc3054c-6292-144d-eff7-cd557f527468">
|
||||
<div ng-if="course.markCardDetails==false">
|
||||
<!–<center>
|
||||
<h5 class="text-dark">No Mark Card Details!</h5>
|
||||
</center>–>
|
||||
</div>
|
||||
<table class="table no-margin ng-scope" ng-if="course.markCardDetails!=false">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Type</th>
|
||||
<!– <th>Name</th>–>
|
||||
<th>Status</th>
|
||||
<th>Comments</th>
|
||||
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="mark in course.markCardDetails | unique:'CourseID'">
|
||||
<td>
|
||||
<span>{{mark.Sem_Year}}</span>
|
||||
</td>
|
||||
<!–<td>
|
||||
<span>{{mark.CertificateName}}</span>
|
||||
</td>–>
|
||||
<td>
|
||||
<span>{{mark.ListName}} </span><span> ON </span> <span>{{mark.CDate}}</span>
|
||||
</td>
|
||||
<td>
|
||||
<span>{{mark.Comments}}</span>
|
||||
</td>
|
||||
|
||||
|
||||
</tr>
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<!–
|
||||
view tab end
|
||||
–>
|
||||
|
||||
</div>
|
||||
</tab>
|
||||
<tab heading="Study Material Details" id="material">
|
||||
<div class="panel-scroll height-200 ng-scope ps-container ps-theme-default ps-active-y" perfect-scrollbar="" wheel-propagation="false" suppress-scroll-x="true" data-ps-id="6fc3054c-6292-144d-eff7-cd557f527468">
|
||||
<div ng-if="course.studyMaterialDetails==false">
|
||||
<!– <center>
|
||||
<h5 class="text-dark">No Study Material Details!</h5>
|
||||
</center>–>
|
||||
</div>
|
||||
<table class="table no-margin ng-scope" ng-if="course.studyMaterialDetails!=false">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Type</th>
|
||||
<!– <th>Date</th>–>
|
||||
<th>Status</th>
|
||||
<th>Comments</th>
|
||||
|
||||
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="study in course.studyMaterialDetails | unique:'CourseID'">
|
||||
<td>
|
||||
<span>{{study.Sem_Year}}</span></td>
|
||||
<!–<td>
|
||||
<span>{{study.SDate}}</span></td>–>
|
||||
<td>
|
||||
<span>{{study.ListName}} </span><span> ON </span> <span>{{study.SDate}}</span>
|
||||
</td>
|
||||
<td>
|
||||
<span>{{study.Comments}}</span></td>
|
||||
|
||||
</tr>
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<!–
|
||||
view tab end
|
||||
–>
|
||||
|
||||
</div>
|
||||
</tab>
|
||||
|
||||
</tabset>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</div>-->
|
||||
|
||||
<div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div ng-if="courseEditLoading == true" class="text-center">
|
||||
<!--<img src="assets/images/ajax_loader_blue.gif" style="width: 5%; height: 30%">-->
|
||||
<h3>Fetching ...</h3>
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
|
||||
<fieldset ng-if="courseEditLoading == false">
|
||||
<legend>
|
||||
Student Status Details
|
||||
</legend>
|
||||
<div class="row" ng-repeat="course in courseDetails.courseStatus">
|
||||
<div class="col-md-12">
|
||||
<div class="panel panel-white" id="panel2">
|
||||
<div class="panel-heading">
|
||||
<div class="clearfix padding-5 space5" >
|
||||
|
||||
<div class="col-xs-3 text-center no-padding">
|
||||
<!--
|
||||
<h4 class="panel-title text-purple">{{course.UniversityName}} / {{course.CourseName}}</h4>
|
||||
-->
|
||||
<a class="panel-title text-blue" tooltip="University">
|
||||
{{course.UniversityName}}
|
||||
</a>
|
||||
</div>
|
||||
<div class="col-xs-3 text-center no-padding">
|
||||
<a class="text-blue">
|
||||
Course : {{course.CourseName}}
|
||||
</a>
|
||||
</div>
|
||||
<div class="col-xs-3 text-center no-padding">
|
||||
<a class="text-blue">
|
||||
Enrollment ID : {{course.EnrollmentID}}
|
||||
</a>
|
||||
</div>
|
||||
<div class="col-xs-3 text-center no-padding">
|
||||
<a class="text-blue">
|
||||
Batch Name : {{course.BatchName}}
|
||||
</a>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
<ct-paneltool class="panel-tools" tool-collapse="tool-collapse">
|
||||
|
||||
</ct-paneltool>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<div collapse="panel2" ng-init="panel2=true" class="panel-wrapper">
|
||||
<div class="panel-body">
|
||||
|
||||
|
||||
<tabset class="tabbable">
|
||||
|
||||
|
||||
<tab heading="Fees Details" id="fees">
|
||||
<div class="panel-scroll height-200 ng-scope ps-container ps-theme-default ps-active-y" perfect-scrollbar="" wheel-propagation="false" suppress-scroll-x="true" data-ps-id="6fc3054c-6292-144d-eff7-cd557f527468">
|
||||
<div ng-if="course.feesDetails==false">
|
||||
<!-- <center>
|
||||
<h5 class="text-dark">No Fees Details!</h5>
|
||||
</center>-->
|
||||
</div>
|
||||
<table class="table no-margin ng-scope" ng-controller="FeesModalDemoCtrl" ng-if="course.feesDetails!=false">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Fees Name</th>
|
||||
<th>Session Name</th>
|
||||
<th>Roll Number</th>
|
||||
<th>Total Payable Fees</th>
|
||||
<th>Paid Fees</th>
|
||||
<th>Balance Fees</th>
|
||||
<th></th>
|
||||
<th></th>
|
||||
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="fees in course.feesDetails">
|
||||
<td>
|
||||
<span>{{fees.FeesName}}</span></td>
|
||||
<td>
|
||||
<span>{{fees.SessionName}}</span></td>
|
||||
<td>
|
||||
<span>{{fees.RollNo}}</span></td>
|
||||
<td>
|
||||
<span>{{fees.PayableAmount}}</span></td>
|
||||
<td>
|
||||
<span>{{fees.PaidBillAmount}}</span></td>
|
||||
<td>
|
||||
<span>{{fees.BalanceAmount}}</span></td>
|
||||
<td><span>
|
||||
<a tooltip="{{dynamicTooltip}}">
|
||||
<i class="fa fa-eye" ng-click="open(fees)"></i>
|
||||
</a> </span>
|
||||
</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
<script type="text/ng-template" id="myModalContent.html">
|
||||
|
||||
<div class="modal-header">
|
||||
<h4 class="modal-title">{{items.FeesName}} Details</h4>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<table class="table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Bill NO</th>
|
||||
<th>Bill Amount</th>
|
||||
<th>Bill Date</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="v in items.paidDetails">
|
||||
<td>{{v.BillNO}}</td>
|
||||
<td>{{v.BillAmount}}</td>
|
||||
<td>{{v.BillDate}}</td>
|
||||
|
||||
</tr>
|
||||
|
||||
</table>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button class="btn btn-danger btn-sm" ng-click="cancel()">Cancel</button>
|
||||
</div>
|
||||
</script>
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<!--
|
||||
view tab end
|
||||
-->
|
||||
|
||||
</div>
|
||||
|
||||
</tab>
|
||||
|
||||
<tab heading="Document Details" id="document">
|
||||
<div class="panel-scroll height-200 ng-scope ps-container ps-theme-default ps-active-y" perfect-scrollbar="" wheel-propagation="false" suppress-scroll-x="true" data-ps-id="6fc3054c-6292-144d-eff7-cd557f527468">
|
||||
<div ng-if="course.applicationDetails==false">
|
||||
<!--<center>
|
||||
<h5 class="text-dark">No Document Details!</h5>
|
||||
</center>-->
|
||||
</div>
|
||||
<table class="table no-margin ng-scope" ng-if="course.applicationDetails!=false">
|
||||
<thead>
|
||||
<tr>
|
||||
<!-- <th>Type</th>-->
|
||||
<th>Document Name</th>
|
||||
<th>Status</th>
|
||||
<th>Comments</th>
|
||||
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="cert in course.applicationDetails | unique:'CertificateName'">
|
||||
<!-- <td>
|
||||
<span>{{cert.Sem_Year}}</span>
|
||||
</td>-->
|
||||
<td>
|
||||
<span>{{cert.CertificateName}}</span>
|
||||
</td>
|
||||
<td>
|
||||
<span>{{cert.ListName}} </span><span> ON </span> <span>{{cert.AppDate}}</span>
|
||||
</td>
|
||||
<td>
|
||||
<span>{{cert.Comments}}</span>
|
||||
</td>
|
||||
|
||||
|
||||
</tr>
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<!--
|
||||
view tab end
|
||||
-->
|
||||
|
||||
</div>
|
||||
</tab>
|
||||
|
||||
|
||||
<tab heading="Mark Card Details" id="mark">
|
||||
<div class="panel-scroll height-200 ng-scope ps-container ps-theme-default ps-active-y" perfect-scrollbar="" wheel-propagation="false" suppress-scroll-x="true" data-ps-id="6fc3054c-6292-144d-eff7-cd557f527468">
|
||||
<div ng-if="course.markCardDetails==false">
|
||||
<!--<center>
|
||||
<h5 class="text-dark">No Mark Card Details!</h5>
|
||||
</center>-->
|
||||
</div>
|
||||
<table class="table no-margin ng-scope" ng-if="course.markCardDetails!=false">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Type</th>
|
||||
<!-- <th>Name</th>-->
|
||||
<th>Status</th>
|
||||
<th>Comments</th>
|
||||
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="mark in course.markCardDetails | unique:'CourseID'">
|
||||
<td>
|
||||
<span>{{mark.Sem_Year}}</span>
|
||||
</td>
|
||||
<!--<td>
|
||||
<span>{{mark.CertificateName}}</span>
|
||||
</td>-->
|
||||
<td>
|
||||
<span>{{mark.ListName}} </span><span> ON </span> <span>{{mark.CDate}}</span>
|
||||
</td>
|
||||
<td>
|
||||
<span>{{mark.Comments}}</span>
|
||||
</td>
|
||||
|
||||
|
||||
</tr>
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<!--
|
||||
view tab end
|
||||
-->
|
||||
|
||||
</div>
|
||||
</tab>
|
||||
<tab heading="Study Material Details" id="material">
|
||||
<div class="panel-scroll height-200 ng-scope ps-container ps-theme-default ps-active-y" perfect-scrollbar="" wheel-propagation="false" suppress-scroll-x="true" data-ps-id="6fc3054c-6292-144d-eff7-cd557f527468">
|
||||
<div ng-if="course.studyMaterialDetails==false">
|
||||
<!-- <center>
|
||||
<h5 class="text-dark">No Study Material Details!</h5>
|
||||
</center>-->
|
||||
</div>
|
||||
<table class="table no-margin ng-scope" ng-if="course.studyMaterialDetails!=false">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Type</th>
|
||||
<!-- <th>Date</th>-->
|
||||
<th>Status</th>
|
||||
<th>Comments</th>
|
||||
|
||||
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="study in course.studyMaterialDetails | unique:'CourseID'">
|
||||
<td>
|
||||
<span>{{study.Sem_Year}}</span></td>
|
||||
<!--<td>
|
||||
<span>{{study.SDate}}</span></td>-->
|
||||
<td>
|
||||
<span>{{study.ListName}} </span><span> ON </span> <span>{{study.SDate}}</span>
|
||||
</td>
|
||||
<td>
|
||||
<span>{{study.Comments}}</span></td>
|
||||
|
||||
</tr>
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<!--
|
||||
view tab end
|
||||
-->
|
||||
|
||||
</div>
|
||||
</tab>
|
||||
|
||||
</tabset>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="pull-right">
|
||||
<!-- <button type="submit" tabindex="30" ladda="ldloading1.zoom_in" class="btn btn-wide btn-success" data-style="zoom-in">
|
||||
Submit
|
||||
</button>-->
|
||||
<button type="reset" tabindex="31" class="btn btn-warning btn-wide" tabindex="9" ng-click="cancel()">
|
||||
Cancel
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
</fieldset>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -170,9 +170,21 @@
|
||||
</thead>
|
||||
<tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results">
|
||||
<tr>
|
||||
<td>{{p.MobileNumber}}</td>
|
||||
<td>{{p.Firstname}} {{p.Lastname}}</td>
|
||||
<td>
|
||||
<a tooltip="View Student Status" ng-click="viewStudentPage(p.StudentID);" class="text-dark">
|
||||
{{p.MobileNumber}}
|
||||
</a>
|
||||
</td>
|
||||
|
||||
<td>
|
||||
|
||||
<a tooltip="View Student Status" ng-click="viewStudentPage(p.StudentID);" class="text-dark">
|
||||
{{p.Firstname}} {{p.Lastname}}
|
||||
</a>
|
||||
|
||||
</td>
|
||||
<td>{{p.Fathername}}</td>
|
||||
|
||||
<td><span ng-if="p.IsActive == true" style="text-transform: uppercase; text-shadow: 1px 1px #166307; color: #2be209 ">ACTIVE</span>
|
||||
<span tooltip="{{p.DeactiveComments}}" ng-if="p.IsActive == false" style="text-transform: uppercase; text-shadow: 1px 1px rgb(167, 88, 15); color: rgba(236, 24, 24, 0.98823529);">DEACTIVE</span></td>
|
||||
<td><div id="containersPara">{{p.Comments}}</div></td>
|
||||
@ -188,6 +200,9 @@
|
||||
<tr ng-show="editCourseId === p.StudentID" ng-if="editCourseId === p.StudentID">
|
||||
<td colspan="6" ng-include src="'assets/views/student/editStudentCourseDetails.html'"></td>
|
||||
</tr>
|
||||
<tr ng-show="studentViewPage === p.StudentID" ng-if="studentViewPage === p.StudentID">
|
||||
<td colspan="6" ng-include src="'assets/views/student/studentViewInManagement.html'"></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
<!-- end: STUDENT TITLE -->
|
||||
<!-- start: LIST GROUP -->
|
||||
<div ng-controller="studentSuperAdminCtrl" class="container-fluid container-fullw bg-white">
|
||||
|
||||
|
||||
<style>
|
||||
/*#wrapper {
|
||||
width: 200px;
|
||||
@ -48,11 +48,11 @@
|
||||
</style>
|
||||
<div ng-init="init()">
|
||||
<div class="row">
|
||||
<div class="col-lg-4"></div>
|
||||
<div class="col-lg-4">
|
||||
<div class="col-lg-4"></div>
|
||||
<div class="col-lg-4">
|
||||
<div>
|
||||
<label for="form-field-select-2">
|
||||
Select Branch
|
||||
Select Branch
|
||||
</label>
|
||||
|
||||
<select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="branch" ng-model="localBranchDetails" ng-change="changeBranch()"
|
||||
@ -60,16 +60,16 @@
|
||||
<option value="" disabled selected>Select Branch</option>
|
||||
<option ng-repeat="bdata in branchList_data" value="{{bdata.BranchCode}}">{{bdata.BranchName}}</option>
|
||||
</select>
|
||||
|
||||
|
||||
</div>
|
||||
<!-- ng-if="loader == true"-->
|
||||
<span ng-if="loader == true" style="color: #007AFF;
|
||||
font-size: 16px;">Loading...</span>
|
||||
</div>
|
||||
<div class="col-lg-4"></div>
|
||||
</div>
|
||||
<div class="col-lg-4"></div>
|
||||
</div>
|
||||
<br>
|
||||
|
||||
|
||||
<div class="row" ng-if="viewStudentDetailsPage">
|
||||
<!--{{tab1}}
|
||||
<button ng-click="tabActive('0')" value="Tab1">Tab1</button>
|
||||
@ -78,16 +78,16 @@
|
||||
<tab active="tabactive1" ng-click="tabActive('tabactive1')" heading="View Student" id="studentbranch">
|
||||
<div class="container-fluid container-fullw">
|
||||
<div class="row">
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<!--<pre>{{searchData | json }}</pre> -->
|
||||
<div class="col-md-4">
|
||||
<label for="form-field-select-2">
|
||||
University
|
||||
University
|
||||
</label>
|
||||
|
||||
<select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="myUnivSearch"
|
||||
@ -100,7 +100,7 @@
|
||||
|
||||
<div class="col-md-4">
|
||||
<label for="form-field-select-2">
|
||||
Course
|
||||
Course
|
||||
</label>
|
||||
|
||||
<select class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="course" ng-model="searchData.Course" ng-change="getValueChange()">
|
||||
@ -111,7 +111,7 @@
|
||||
|
||||
<div class="col-md-4">
|
||||
<!--<label for="form-field-select-2">
|
||||
Batch
|
||||
Batch
|
||||
</label>
|
||||
|
||||
<select class="form-control" tabindex="3" class="cs-select cs-skin-elastic" name="batch" ng-model="searchData.Batch" ng-change="getValueChange()">
|
||||
@ -124,10 +124,10 @@
|
||||
});
|
||||
</script>-->
|
||||
<label for="form-field-select-2">
|
||||
Search
|
||||
Search
|
||||
</label>
|
||||
<input class="form-control" type="text" ng-model="search" id="search" autofocus tabindex="1" placeholder="Search" /><br><br>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
@ -195,8 +195,18 @@
|
||||
</thead>
|
||||
<tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results">
|
||||
<tr>
|
||||
<td>{{p.MobileNumber}}</td>
|
||||
<td>{{p.Firstname}} {{p.Lastname}}</td>
|
||||
<td>
|
||||
<a tooltip="View Student Status" ng-click="viewStudentPage(p.StudentID);" class="text-dark">
|
||||
{{p.MobileNumber}}
|
||||
</a>
|
||||
</td>
|
||||
<td>
|
||||
|
||||
<a tooltip="View Student Status" ng-click="viewStudentPage(p.StudentID);" class="text-dark">
|
||||
{{p.Firstname}} {{p.Lastname}}
|
||||
</a>
|
||||
|
||||
</td>
|
||||
<td>{{p.Fathername}}</td>
|
||||
<td><span ng-if="p.IsActive == true" style="text-transform: uppercase; text-shadow: 1px 1px #166307; color: #2be209 ">ACTIVE</span>
|
||||
<span tooltip="{{p.DeactiveComments}}" ng-if="p.IsActive == false" style="text-transform: uppercase; text-shadow: 1px 1px rgb(167, 88, 15); color: rgba(236, 24, 24, 0.98823529);">DEACTIVE</span></td>
|
||||
@ -213,6 +223,9 @@
|
||||
<tr ng-show="editCourseId === p.StudentID" ng-if="editCourseId === p.StudentID">
|
||||
<td colspan="6" ng-include src="'assets/views/student/editStudentCourseDetails.html'"></td>
|
||||
</tr>
|
||||
<tr ng-show="studentViewPage === p.StudentID" ng-if="studentViewPage === p.StudentID">
|
||||
<td colspan="6" ng-include src="'assets/views/student/studentViewInManagement.html'"></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
|
||||
@ -468,7 +481,7 @@
|
||||
</div>
|
||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.caste.$dirty && Form.caste.$invalid}">
|
||||
<label>
|
||||
Caste
|
||||
Caste
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter Caste" tabindex="15" class="form-control" name="caste" ng-model="myModel.caste" ng-pattern="/^[a-zA-Z.\s]*$/"
|
||||
@ -477,7 +490,7 @@
|
||||
</div>
|
||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.category.$dirty && Form.category.$invalid}">
|
||||
<label>
|
||||
Category
|
||||
Category
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter Category" tabindex="16" class="form-control" name="category" ng-model="myModel.category"
|
||||
@ -489,7 +502,7 @@
|
||||
|
||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.religion.$dirty && Form.religion.$invalid}">
|
||||
<label>
|
||||
Religion
|
||||
Religion
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter Religion" tabindex="17" class="form-control" name="religion" ng-model="myModel.religion"
|
||||
@ -498,7 +511,7 @@
|
||||
</div>
|
||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.nationality.$dirty && Form.nationality.$invalid}">
|
||||
<label>
|
||||
Nationality
|
||||
Nationality
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter Nationality" tabindex="18" class="form-control" name="nationality" ng-model="myModel.nationality"
|
||||
@ -507,7 +520,7 @@
|
||||
</div>
|
||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.qualificaion.$dirty && Form.qualificaion.$invalid}">
|
||||
<label>
|
||||
Pre Qualification
|
||||
Pre Qualification
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter Qualification" tabindex="19" class="form-control" name="qualificaion" ng-model="myModel.prequalification"
|
||||
@ -519,7 +532,7 @@
|
||||
|
||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.occupation.$dirty && Form.occupation.$invalid}">
|
||||
<label>
|
||||
Occupation
|
||||
Occupation
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter Occupation" tabindex="20" class="form-control" name="occupation" ng-model="myModel.occupation"
|
||||
@ -528,7 +541,7 @@
|
||||
</div>
|
||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.designation.$dirty && Form.designation.$invalid}">
|
||||
<label>
|
||||
Designation
|
||||
Designation
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter Designation" tabindex="21" class="form-control" name="designation" ng-model="myModel.designation"
|
||||
@ -537,7 +550,7 @@
|
||||
</div>
|
||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.companyname.$dirty && Form.companyname.$invalid}">
|
||||
<label>
|
||||
Company Name
|
||||
Company Name
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter Company Name" tabindex="22" class="form-control" name="companyname" ng-model="myModel.companyname"
|
||||
@ -548,7 +561,7 @@
|
||||
<div class="row">
|
||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.referredby.$dirty && Form.referredby.$invalid}">
|
||||
<label>
|
||||
Referred By
|
||||
Referred By
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter Refer's Name" tabindex="23" class="form-control" name="referredby" ng-model="myModel.referredby"
|
||||
@ -673,7 +686,7 @@
|
||||
<div class="row">
|
||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.enrollmentid.$dirty && Form.enrollmentid.$invalid}">
|
||||
<label>
|
||||
Enrollment ID
|
||||
Enrollment ID
|
||||
</label>
|
||||
<input type="text" name="enrollmentid" tabindex="27" placeholder="Enter Entollment ID" class="form-control" ng-model="myModelCourseAdd.enrollmentid"
|
||||
/>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user