course details changes done
This commit is contained in:
gandhimathi
parent
67513a8a05
commit
6ae2e2f1c0
@ -64,14 +64,14 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter",
|
||||
|
||||
$scope.myModel.search='';
|
||||
$scope.toMinDate = '';
|
||||
$scope.myModel.dateTo='';
|
||||
$scope.myModel.dateTo='';
|
||||
}
|
||||
else{
|
||||
if(type=='2'){
|
||||
if(type=='2'){
|
||||
|
||||
$scope.myModel.search = $filter('date')(value.searchDate, 'yyyy-MM-dd');
|
||||
$scope.toMinDate = $filter('date')(value.searchDate, 'MM-dd-yyyy');
|
||||
}
|
||||
$scope.myModel.search = $filter('date')(value.searchDate, 'yyyy-MM-dd');
|
||||
$scope.toMinDate = $filter('date')(value.searchDate, 'MM-dd-yyyy');
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -131,7 +131,7 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter",
|
||||
}
|
||||
else if((dateValue.search !=null && dateValue.search !=undefined) && (dateValue.dateTo ==null || dateValue.dateTo ==undefined || dateValue.dateTo =='')){
|
||||
var startDate =dateValue.search;
|
||||
// var endDate = $filter('date')(dateValue.searchDate, 'yyyy-MM-dd');
|
||||
// var endDate = $filter('date')(dateValue.searchDate, 'yyyy-MM-dd');
|
||||
var strDate = startDate;
|
||||
var arrayDate = $filter('date')(strDate, 'dd-MM-yyyy');
|
||||
|
||||
@ -140,7 +140,7 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter",
|
||||
}
|
||||
|
||||
|
||||
$scope.init(listDate);
|
||||
$scope.init(listDate);
|
||||
|
||||
|
||||
}
|
||||
@ -367,7 +367,7 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter",
|
||||
$scope.status=response.data.statusDetails;
|
||||
$scope.staffDetails=response.data.staffDetails;
|
||||
//$scope.university=response.data.universityDetails;
|
||||
// $scope.myModel.status=$scope.status[0].ListCode;
|
||||
// $scope.myModel.status=$scope.status[0].ListCode;
|
||||
$scope.myModel.studentName=response.data.existLeadDetails.LeadName;
|
||||
$scope.myModel.universityName=response.data.existLeadDetails.University;
|
||||
$scope.myModel.courseName=response.data.existLeadDetails.Course;
|
||||
@ -375,11 +375,11 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter",
|
||||
$scope.myModel.address=response.data.existLeadDetails.Address;
|
||||
|
||||
// find index for university drop down list
|
||||
/* for(var i in $scope.university) {
|
||||
if($scope.university[i].universityID==response.data.existLeadDetails.UniversityID){
|
||||
$scope.myModel.universityName=$scope.university[i];
|
||||
}
|
||||
}*/
|
||||
/* for(var i in $scope.university) {
|
||||
if($scope.university[i].universityID==response.data.existLeadDetails.UniversityID){
|
||||
$scope.myModel.universityName=$scope.university[i];
|
||||
}
|
||||
}*/
|
||||
|
||||
$scope.loading=false;
|
||||
|
||||
@ -437,8 +437,13 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter",
|
||||
angular.forEach($scope.tillPendingDetails, function (value, key) {
|
||||
$scope.currentDate = new Date().getFullYear() + '-' + ('0' + (new Date().getMonth() + 1)).slice(-2) + '-' + ('0' + new Date().getDate()).slice(-2);
|
||||
// $scope.currentDate = new Date().getFullYear() + '-' + ('0' + (new Date().getMonth() + 1)).slice(-2) + '-' + ('0' + new Date().getDate()).slice(-2);
|
||||
$scope.currentDate=$filter('date')(new Date(), 'dd-MM-yyyy');
|
||||
if (($scope.currentDate) > (value.followupDetails) && (value.statusName!='CLOSE')) {
|
||||
$scope.currentDate=$filter('date')(new Date(), 'yyyy-MM-dd');
|
||||
var getDay = value.followupDetails.substring(0, 2);
|
||||
var getMonth = value.followupDetails.substring(3, 5);
|
||||
var getYear = value.followupDetails.substring(6, 10);
|
||||
// var dbFollowDate = getYear+'-'+getMonth+'-'+getDay;
|
||||
$scope.dbFollowDate = getYear+'-'+getMonth+'-'+getDay;
|
||||
if (($scope.currentDate) > ( $scope.dbFollowDate) && (value.statusName!='CLOSE')) {
|
||||
$scope.data.push(value);
|
||||
}
|
||||
|
||||
@ -448,7 +453,7 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter",
|
||||
|
||||
angular.forEach(response.data.trackingDetails, function (value1, key1) {
|
||||
|
||||
$scope.data.push(value1);
|
||||
$scope.data.push(value1);
|
||||
});
|
||||
|
||||
|
||||
@ -461,7 +466,7 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter",
|
||||
|
||||
}
|
||||
|
||||
else if (response.data.status == 200 && response.data.trackingStatus == true && response.data.pendingTrackingDetails.trackingStatus !=true) {
|
||||
else if (response.data.status == 200 && response.data.trackingStatus == true && response.data.pendingTrackingDetails.trackingStatus !=true) {
|
||||
$scope.loader = false;
|
||||
|
||||
$rootScope.trackingStatus = response.data.statusDetails;
|
||||
@ -480,8 +485,13 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter",
|
||||
angular.forEach($scope.tillPendingDetails, function (value, key) {
|
||||
$scope.currentDate = new Date().getFullYear() + '-' + ('0' + (new Date().getMonth() + 1)).slice(-2) + '-' + ('0' + new Date().getDate()).slice(-2);
|
||||
// $scope.currentDate = new Date().getFullYear() + '-' + ('0' + (new Date().getMonth() + 1)).slice(-2) + '-' + ('0' + new Date().getDate()).slice(-2);
|
||||
$scope.currentDate=$filter('date')(new Date(), 'dd-MM-yyyy');
|
||||
if (($scope.currentDate) > (value.followupDetails) && (value.statusName!='CLOSE')) {
|
||||
$scope.currentDate=$filter('date')(new Date(), 'yyyy-MM-dd');
|
||||
var getDay = value.followupDetails.substring(0, 2);
|
||||
var getMonth = value.followupDetails.substring(3, 5);
|
||||
var getYear = value.followupDetails.substring(6, 10);
|
||||
// var dbFollowDate = getYear+'-'+getMonth+'-'+getDay;
|
||||
$scope.dbFollowDate = getYear+'-'+getMonth+'-'+getDay;
|
||||
if (($scope.currentDate) > ($scope.dbFollowDate) && (value.statusName!='CLOSE')) {
|
||||
|
||||
$scope.data.push(value);
|
||||
}
|
||||
@ -522,7 +532,7 @@ app.controller('callTrackingLeadCtrl', ["$scope","$rootScope","toaster", "$filte
|
||||
"leadDate": new Date(),
|
||||
"search":$filter('date')(new Date(), 'yyyy-MM-dd')
|
||||
|
||||
};
|
||||
};
|
||||
$scope.hideDateSearch=true;
|
||||
|
||||
|
||||
@ -616,11 +626,11 @@ app.controller('callTrackingLeadCtrl', ["$scope","$rootScope","toaster", "$filte
|
||||
|
||||
}
|
||||
|
||||
//from date change
|
||||
//from date change
|
||||
$scope.checkDate = function (value) {
|
||||
|
||||
|
||||
$scope.myModel.search = $filter('date')(value.leadDate, 'yyyy-MM-dd');
|
||||
$scope.myModel.search = $filter('date')(value.leadDate, 'yyyy-MM-dd');
|
||||
|
||||
|
||||
$scope.init($scope.myModel);
|
||||
@ -635,19 +645,19 @@ app.controller('callTrackingLeadCtrl', ["$scope","$rootScope","toaster", "$filte
|
||||
* */
|
||||
$scope.init = function (myModel) {
|
||||
|
||||
/* if(isNaN(myModel.leadDate)){
|
||||
$scope.loadDate= $filter('date')(new Date(), 'yyyy-MM-dd');
|
||||
/* if(isNaN(myModel.leadDate)){
|
||||
$scope.loadDate= $filter('date')(new Date(), 'yyyy-MM-dd');
|
||||
|
||||
}
|
||||
else if(myModel.leadDate==null || myModel.leadDate==''){
|
||||
$scope.loadDate="";
|
||||
}
|
||||
else{
|
||||
$scope.getdate=new Date(myModel.leadDate).toDateString();
|
||||
}
|
||||
else if(myModel.leadDate==null || myModel.leadDate==''){
|
||||
$scope.loadDate="";
|
||||
}
|
||||
else{
|
||||
$scope.getdate=new Date(myModel.leadDate).toDateString();
|
||||
|
||||
$scope.loadDate = $filter('date')(new Date($scope.getdate), 'yyyy-MM-dd');
|
||||
$scope.loadDate = $filter('date')(new Date($scope.getdate), 'yyyy-MM-dd');
|
||||
|
||||
}*/
|
||||
}*/
|
||||
|
||||
$scope.loader = true;
|
||||
|
||||
@ -701,9 +711,9 @@ app.controller('callTrackingLeadCtrl', ["$scope","$rootScope","toaster", "$filte
|
||||
}
|
||||
|
||||
}]);
|
||||
/*
|
||||
* close tracking controller
|
||||
* */
|
||||
/*
|
||||
* close tracking controller
|
||||
* */
|
||||
app.controller('callTrackingCloseCtrl', ["$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','');
|
||||
@ -819,18 +829,18 @@ app.controller('callTrackingCloseCtrl', ["$scope","$rootScope","toaster", "$filt
|
||||
* */
|
||||
$scope.init = function (myModel) {
|
||||
|
||||
/* if(isNaN(myModel.closeDate)){
|
||||
$scope.loadDate= $filter('date')(new Date(), 'yyyy-MM-dd');
|
||||
/* if(isNaN(myModel.closeDate)){
|
||||
$scope.loadDate= $filter('date')(new Date(), 'yyyy-MM-dd');
|
||||
|
||||
}
|
||||
else if(myModel.closeDate==null || myModel.closeDate==''){
|
||||
$scope.loadDate="";
|
||||
}
|
||||
else{
|
||||
$scope.getdate=new Date(myModel.closeDate).toDateString();
|
||||
}
|
||||
else if(myModel.closeDate==null || myModel.closeDate==''){
|
||||
$scope.loadDate="";
|
||||
}
|
||||
else{
|
||||
$scope.getdate=new Date(myModel.closeDate).toDateString();
|
||||
|
||||
$scope.loadDate = $filter('date')(new Date($scope.getdate), 'yyyy-MM-dd');
|
||||
}*/
|
||||
$scope.loadDate = $filter('date')(new Date($scope.getdate), 'yyyy-MM-dd');
|
||||
}*/
|
||||
$scope.loader = true;
|
||||
|
||||
var getRecentclose = {
|
||||
@ -1002,18 +1012,18 @@ app.controller('callTrackingPendingCtrl', ["$scope","$rootScope","toaster", "$fi
|
||||
* */
|
||||
$scope.init = function (myModel) {
|
||||
|
||||
/* if(isNaN(myModel.pendingDate)){
|
||||
$scope.loadDate= $filter('date')(new Date(), 'yyyy-MM-dd');
|
||||
/* if(isNaN(myModel.pendingDate)){
|
||||
$scope.loadDate= $filter('date')(new Date(), 'yyyy-MM-dd');
|
||||
|
||||
}
|
||||
else if(myModel.pendingDate==null || myModel.pendingDate==''){
|
||||
$scope.loadDate="";
|
||||
}
|
||||
else{
|
||||
$scope.getdate=new Date(myModel.pendingDate).toDateString();
|
||||
}
|
||||
else if(myModel.pendingDate==null || myModel.pendingDate==''){
|
||||
$scope.loadDate="";
|
||||
}
|
||||
else{
|
||||
$scope.getdate=new Date(myModel.pendingDate).toDateString();
|
||||
|
||||
$scope.loadDate = $filter('date')(new Date($scope.getdate), 'yyyy-MM-dd');
|
||||
}*/
|
||||
$scope.loadDate = $filter('date')(new Date($scope.getdate), 'yyyy-MM-dd');
|
||||
}*/
|
||||
$scope.loader = true;
|
||||
|
||||
var getRecentclose = {
|
||||
@ -1099,12 +1109,12 @@ app.controller('callTrackingCtrl2', ["$scope","$rootScope","toaster", "$filter",
|
||||
|
||||
angular.forEach($scope.ListOfTracks,function (value,key) {
|
||||
|
||||
if((value.followupDetails)==$scope.searchedData.searchDate){
|
||||
if((value.followupDetails)==$scope.searchedData.searchDate){
|
||||
|
||||
$scope.searchedTrackingList.push(value);
|
||||
$scope.searchedTrackingList.push(value);
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
});
|
||||
@ -1112,7 +1122,7 @@ app.controller('callTrackingCtrl2', ["$scope","$rootScope","toaster", "$filter",
|
||||
else{
|
||||
angular.forEach($scope.ListOfTracks,function (value,key) {
|
||||
|
||||
$scope.searchedTrackingList.push(value);
|
||||
$scope.searchedTrackingList.push(value);
|
||||
});
|
||||
|
||||
}
|
||||
@ -1158,14 +1168,14 @@ app.controller('callTrackingCtrl2', ["$scope","$rootScope","toaster", "$filter",
|
||||
|
||||
if($scope.searchedData.serachActivity!='' && $scope.searchedData.serachActivity!=null && $scope.searchedData.serachActivity!=undefined){
|
||||
|
||||
$scope.searchText_activity = $scope.searchedData.serachActivity.toLowerCase();
|
||||
angular.forEach($scope.searchedTrackingList_Name, function(item) {
|
||||
$scope.searchText_activity = $scope.searchedData.serachActivity.toLowerCase();
|
||||
angular.forEach($scope.searchedTrackingList_Name, function(item) {
|
||||
|
||||
if( item.ActivityName.toLowerCase().indexOf($scope.searchText_activity) >= 0 ){
|
||||
$scope.searchedTrackingList_Activity.push(item);
|
||||
}
|
||||
if( item.ActivityName.toLowerCase().indexOf($scope.searchText_activity) >= 0 ){
|
||||
$scope.searchedTrackingList_Activity.push(item);
|
||||
}
|
||||
|
||||
});
|
||||
});
|
||||
|
||||
}
|
||||
else{
|
||||
@ -1176,7 +1186,7 @@ app.controller('callTrackingCtrl2', ["$scope","$rootScope","toaster", "$filter",
|
||||
|
||||
}
|
||||
|
||||
// serach assigned to in array list
|
||||
// serach assigned to in array list
|
||||
$scope.searchedTrackingList_AssignedTo=[];
|
||||
|
||||
if($scope.searchedData.searchAssignTo!='' && $scope.searchedData.searchAssignTo!=null && $scope.searchedData.searchAssignTo!=undefined){
|
||||
@ -1228,24 +1238,24 @@ app.controller('callTrackingCtrl2', ["$scope","$rootScope","toaster", "$filter",
|
||||
/*
|
||||
* used to move next track list in searched array list
|
||||
* */
|
||||
angular.forEach($scope.searchedTrackingList_Status,function (value,key) {
|
||||
angular.forEach($scope.searchedTrackingList_Status,function (value,key) {
|
||||
|
||||
if(value.TrackingID==trackID){
|
||||
$scope.nextTrack=$scope.searchedTrackingList_Status[key+1];
|
||||
if($scope.nextTrack!='' && $scope.nextTrack!=undefined){
|
||||
$rootScope.loadFollowupDetails($scope.nextTrack.TrackingID);
|
||||
if(value.TrackingID==trackID){
|
||||
$scope.nextTrack=$scope.searchedTrackingList_Status[key+1];
|
||||
if($scope.nextTrack!='' && $scope.nextTrack!=undefined){
|
||||
$rootScope.loadFollowupDetails($scope.nextTrack.TrackingID);
|
||||
|
||||
}
|
||||
else{
|
||||
swal("EMPTY!", "No more records to display", "info");
|
||||
}
|
||||
else{
|
||||
swal("EMPTY!", "No more records to display", "info");
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
/*
|
||||
@ -1435,7 +1445,7 @@ app.controller('callTrackingCtrl2', ["$scope","$rootScope","toaster", "$filter",
|
||||
else if (myModel1.assignStaff=='') {
|
||||
swal("Warning!", 'Please select assigned to', "warning");
|
||||
}
|
||||
else if (myModel1.comments=='') {
|
||||
else if (myModel1.comments=='') {
|
||||
swal("Warning!", 'Please enter comments', "warning");
|
||||
} else {
|
||||
|
||||
@ -1513,7 +1523,7 @@ app.controller('callTrackingCtrl2', ["$scope","$rootScope","toaster", "$filter",
|
||||
$rootScope.modifyDate1 = moment();
|
||||
$rootScope.modifyDate1.add(30, 'days');
|
||||
$rootScope.futureDate1 = $filter('date')($scope.modifyDate1, 'dd-MM-yyyy');
|
||||
// $rootScope.myModel1.status=$rootScope.followupDetails.StatusCode;
|
||||
// $rootScope.myModel1.status=$rootScope.followupDetails.StatusCode;
|
||||
$rootScope.trackingStatus=response.data.statusDetails;
|
||||
$rootScope.myModel1.branch=$rootScope.followupDetails.CreatedBranch;
|
||||
|
||||
@ -1521,10 +1531,10 @@ app.controller('callTrackingCtrl2', ["$scope","$rootScope","toaster", "$filter",
|
||||
$rootScope.staffArray='';
|
||||
$rootScope.staffDetails=response.data.staffDetails;
|
||||
angular.forEach($rootScope.staffDetails, function(item) {
|
||||
if(item.BranchCode==$rootScope.myModel1.branch){
|
||||
$rootScope.staffArray = item.staffDetails;
|
||||
if(item.BranchCode==$rootScope.myModel1.branch){
|
||||
$rootScope.staffArray = item.staffDetails;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
@ -1607,7 +1617,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$modal", "$log", "API_POINTS"
|
||||
|
||||
|
||||
|
||||
// $scope.items = ['item1', 'item2', 'item3'];
|
||||
// $scope.items = ['item1', 'item2', 'item3'];
|
||||
|
||||
$scope.open = function (studentDetails) {
|
||||
|
||||
@ -1628,9 +1638,9 @@ app.controller('studentModalDemoCtrl', ["$scope", "$modal", "$log", "API_POINTS"
|
||||
|
||||
if (response.data.status == 200 && response.data.studentStatus== true) {
|
||||
$scope.courseEditLoading = false;
|
||||
// $scope.studentDetails = response.data.studentDetails;
|
||||
// $scope.studentDetails = response.data.studentDetails;
|
||||
$scope.studentDetails = response.data;
|
||||
// $scope.courseDetails = response.data.courseDetails;
|
||||
// $scope.courseDetails = response.data.courseDetails;
|
||||
var modalInstance = $modal.open({
|
||||
templateUrl: 'assets/views/student/studentDetailsModal.html',
|
||||
controller: 'ModalInstanceCtrl',
|
||||
|
||||
Loading…
Reference in New Issue
Block a user