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

1620: Admission 3

Browse Source
This commit is contained in:
sriramv 2019-01-23 11:17:50 +05:30
parent c2c41ba1a2
commit e287bbc937
1 changed files with 72 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

145
Apollo/assets/js/controllers/dashboardCtrl.js
View File

@ -897,75 +897,75 @@ app.controller('dashboardCtrl', ["$scope", "$rootScope", "toaster", "$filter", "
columns: ['TrackingId', 'name', 'mobileNo', 'course', 'university', 'activity', 'AssignTo', 'FollowUpDate', 'status'] columns: ['TrackingId', 'name', 'mobileNo', 'course', 'university', 'activity', 'AssignTo', 'FollowUpDate', 'status']
}; };
//Admissions batch //Admissions batch
// var AdmissionsBatch = { var AdmissionsBatch = {
// method: 'POST', method: 'POST',
// url: apiPoint.url + 'admissionBatch/', url: apiPoint.url + 'admissionBatch/',
// headers: { headers: {
// 'Content-Type': 'application/json' 'Content-Type': 'application/json'
// }, },
// data: { data: {
// requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID, requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
// branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID, branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID,
// univ: $scope.filters.univ univ: $scope.filters.univ
// } }
// }; };
//var gridData = 0; var gridData = 0;
// $http(AdmissionsBatch).then(function (response) { $http(AdmissionsBatch).then(function (response) {
// console.log(response); console.log(response);
// if (response.data.lList == true) { if (response.data.lList == true) {
// $scope.fbselect = false; $scope.fbselect = false;
// $scope.adBatch = response.data.l_data; $scope.adBatch = response.data.l_data;
// for (var i = 0; i < $scope.adBatch.length; i++) for (var i = 0; i < $scope.adBatch.length; i++)
// $scope.adBatch[i].Sl_No = i + 1; $scope.adBatch[i].Sl_No = i + 1;
// // var gridData = $scope.adBatch; var gridData = $scope.adBatch;
// $scope.adb = false; $scope.adb = false;
// //console.log($scope.adBatch); //console.log($scope.adBatch);
// $scope.adBatchgrid = { $scope.adBatchgrid = {
// allowSortingBySummary: true, allowSortingBySummary: true,
// allowSorting: true, allowSorting: true,
// allowFiltering: true, allowFiltering: true,
// height: 440, height: 440,
// showBorders: true, showBorders: true,
// fieldChooser: { fieldChooser: {
// enabled: false enabled: false
},
// scrolling: {
// mode: "virtual"
// }, // },
// // scrolling: { "export": {
// // mode: "virtual" enabled: true,
// // }, fileName: "AdmissionsBatch"
// "export": {
// enabled: true,
// fileName: "AdmissionsBatch"
// }, },
// dataSource: { dataSource: {
// fields: [{ fields: [{
// caption: "BatchName", caption: "BatchName",
// width: 100, width: 100,
// dataField: "BatchName", dataField: "BatchName",
// area: "row" area: "row"
// }, },
// { {
// caption: "AdmittedBy", caption: "AdmittedBy",
// dataField: "AdmittedBy", dataField: "AdmittedBy",
// area: "column" area: "column"
// }, { }, {
// caption: "count", caption: "count",
// dataField: "count", dataField: "count",
// dataType: "number", dataType: "number",
// //summaryType: "sum", //summaryType: "sum",
// width: 100, width: 100,
// area: "data" area: "data"
// }], }],
// store: $scope.adBatch store: $scope.adBatch
// } }
// }; };
// } else { } else {
// $scope.adb = true; $scope.adb = true;
// $scope.message = response.data.message; $scope.message = response.data.message;
// } }
// }); });
@ -975,7 +975,7 @@ app.controller('dashboardCtrl', ["$scope", "$rootScope", "toaster", "$filter", "
$scope.batchFilter = function () { $scope.batchFilter = function () {
console.log('hi'); //console.log('hi');
$scope.adBatchgrid1 = ''; $scope.adBatchgrid1 = '';
//Admissions batch //Admissions batch
@ -1005,7 +1005,7 @@ app.controller('dashboardCtrl', ["$scope", "$rootScope", "toaster", "$filter", "
$scope.adBatchfilter = response.data.l_data; $scope.adBatchfilter = response.data.l_data;
for (var i = 0; i < $scope.adBatchfilter.length; i++) for (var i = 0; i < $scope.adBatchfilter.length; i++)
$scope.adBatchfilter[i].Sl_No = i + 1; $scope.adBatchfilter[i].Sl_No = i + 1;
// var gridData = $scope.adBatch; var gridData = $scope.adBatch;
$scope.adb = false; $scope.adb = false;
@ -1056,7 +1056,7 @@ app.controller('dashboardCtrl', ["$scope", "$rootScope", "toaster", "$filter", "
}; };
// $scope.batchFilterClick(); $scope.batchFilterClick();
} else { } else {
$scope.fbselect = false; $scope.fbselect = false;
@ -1075,18 +1075,17 @@ app.controller('dashboardCtrl', ["$scope", "$rootScope", "toaster", "$filter", "
}, { }, {
caption: "AdmittedBy", caption: "AdmittedBy",
dataField: "AdmittedBy", dataField: "AdmittedBy",
// dataType: "string", dataType: "string",
// width: 200, area: "column"
area: "column"
}, { }, {
caption: "AdmittedBy", caption: "AdmittedBy",
dataField: "AdmittedBy", dataField: "AdmittedBy",
dataType: "number", dataType: "number",
summaryType: "sum", //summaryType: "sum",
// width: 100, // width: 100,
area: "data" area: "data"
}], }],
// store: $scope.adBatchfilter store: $scope.adBatchfilter
}); });
} }
//// ////