diff --git a/Apollo/api/application/controllers/DayBookMaster_Controller.php b/Apollo/api/application/controllers/DayBookMaster_Controller.php new file mode 100644 index 00000000..5704dc8a --- /dev/null +++ b/Apollo/api/application/controllers/DayBookMaster_Controller.php @@ -0,0 +1,134 @@ +methods['addDaybookMasterDetails_post']['limit'] = 100; // 50 requests per hour per user/key + $this->methods['getDayBookMasterDetails_post']['limit'] = 500; // 50 requests per hour per user/key + $this->methods['updateDayBookMasterDetails_post']['limit'] = 500; + // load the model + $this->load->model('DaybookMaster_model', 'daybookmaster_model'); + + } + + /* + * This method used to get day book master details + * created by kms + * */ + + public function addDaybookMasterDetails_post() + { + $now = new DateTime(); + $now->setTimezone(new DateTimezone('Asia/Kolkata')); + $details['TypeID'] = $this->post('type'); + $details['TypeName'] = $this->post('name'); + $details['IsActive'] = $this->post('status'); + $details['CreatedBy'] = $this->post('createdBy'); + $details['CreatedOn'] = $now->format('Y-m-d H:i:s'); + $addDetails = $this->daybookmaster_model->addDetails($details);// Check if the users data store contains users (in case the database result returns NULL) + if ($addDetails) + { + $addDetails['status'] = REST_Controller::HTTP_OK; + // Set the response and exit + $this->response($addDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code + } + else + { + // Set the response and exit + $this->response([ + 'message' => 'Something went wrong.please try again!', + 'status' => REST_Controller::HTTP_NOT_FOUND + ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code + } + + + } + /* + * This method used to get day book master details + * created by kms + * */ + public function getDayBookMasterDetails_post() + { + $requestedBy = $this->post('requestedBy'); + $getdetails = $this->daybookmaster_model->getDayBookDetails($requestedBy); + + if ($getdetails) + { + $getdetails['status'] = REST_Controller::HTTP_OK; + // Set the response and exit + $this->response($getdetails, 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 + } + + + } + + /* + * update the day book details + * created by kms + * */ + public function updateDayBookMasterDetails_post() + { + $now = new DateTime(); + $now->setTimezone(new DateTimezone('Asia/Kolkata')); + $details['ID'] = $this->post('ID'); + $details['TypeName'] = $this->post('TypeName'); + $details['TypeID'] = $this->post('TypeID'); + $details['IsActive'] = $this->post('status'); + $details['UpdatedBy'] = $this->post('updatedBy'); + $details['UpdatedOn'] = $now->format("Y-m-d H:i:s"); + $updateDetails = $this->daybookmaster_model->updateDayBook($details);// Check if the users data store contains users (in case the database result returns NULL) + + if ($updateDetails) + + { + $updateDetails['status'] = REST_Controller::HTTP_OK; + // Set the response and exit + $this->response($updateDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code + } + else + { + // Set the response and exit + $this->response([ + 'message' => 'Something went wrong.please try again!', + 'status' => REST_Controller::HTTP_NOT_FOUND + ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code + } + + + } + + + +} \ No newline at end of file diff --git a/Apollo/api/application/models/Calltracking_model.php b/Apollo/api/application/models/Calltracking_model.php index 93f25399..be4fa74f 100755 --- a/Apollo/api/application/models/Calltracking_model.php +++ b/Apollo/api/application/models/Calltracking_model.php @@ -419,10 +419,11 @@ class Calltracking_model extends CI_Model { public function getStudentTrackedID($stuMobile=null) { $this->db->distinct(); - $this->db->select('LT.TrackingID,LT.LeadID,AV.ActivityID,AV.ActivityName'); + $this->db->select('LT.TrackingID,LT.LeadID,AV.ActivityID,AV.ActivityName,PLD.ListName'); $this->db->from(LEAD_DETAILS.' as LD'); $this->db->join(LEAD_TRACKING.' as LT', 'LT.LeadID = LD.LeadID'); $this->db->join(ACTIVITY.' as AV', 'AV.ActivityID = LT.ActivityStatus'); + $this->db->join(PICK_LIST_DETAILS.' as PLD', 'PLD.ListCode = LT.StatusCode'); $this->db->where('LD.MobileNumber',$stuMobile); $this->db->order_by('LT.TrackingID','ASC'); $studeTrackID = $this->db->get(); diff --git a/Apollo/api/application/models/DaybookMaster_model.php b/Apollo/api/application/models/DaybookMaster_model.php new file mode 100644 index 00000000..998d79a1 --- /dev/null +++ b/Apollo/api/application/models/DaybookMaster_model.php @@ -0,0 +1,118 @@ +db->select('TypeName'); + $this->db->where('TypeName', $arrayDetails['TypeName']); + $this->db->where('TypeID', $arrayDetails['TypeID']); + if($this->db->get(INCOMEOUTCOMEMASTER)->first_row()){ + $result['addStatus'] = false; + $result['message'] = "Name is already exist!"; + } else { + $this->db->insert(INCOMEOUTCOMEMASTER, $arrayDetails); + if($this->db->affected_rows() == '1'){ + $result['addStatus'] = true; + $result['message'] = "Successfully day book details is added"; + } + else { + $result['addStatus'] = false; + $result['message'] = "Something went wrong.please try again"; + } + + } + + + + + return $result; + + } + + + + /* + * get day book details + * created by kms + * */ + + public function getDayBookDetails($requestedBy=null) + { + $this->db->select('IOM.ID,IOM.TypeName,IOM.TypeID,IOM.IsActive,PLD.ListName'); + + $this->db->from(INCOMEOUTCOMEMASTER .' as IOM'); + $this->db->join(PICK_LIST_DETAILS.' as PLD', 'PLD.ListCode = IOM.TypeID'); + $this->db->order_by('IOM.ID','DESC'); + $details = $this->db->get(); + if($details->result()){ + + $result['daybookStatus'] = true; + $result['details'] = $details->result(); + } + else { + $result['daybookStatus'] = false; + $result['message'] = "No records found!"; + } + $result['getDayBooktype'] = $this->getDayBookType('10'); + + return $result; + + } + /* + * get day book type + * created by kms + * */ + public function getDayBookType($typeID=null){ + $this->db->select('ListCode,ListName'); + $this->db->where('ListGroup', $typeID); + $typeDetails=$this->db->get(PICK_LIST_DETAILS); + return $typeDetails->result(); + } + /* + * update day book details + * created by kms + * */ + + public function updateDayBook($arrayDetails=null) + { + $this->db->select('TypeName'); + $this->db->where('TypeName', $arrayDetails['TypeName']); + $this->db->where('TypeID', $arrayDetails['TypeID']); + $this->db->where_not_in('ID', $arrayDetails['ID']); + if($this->db->get(INCOMEOUTCOMEMASTER)->first_row()){ + $result['updateStatus'] = false; + $result['message'] = "Name is already exist!"; + } else { + $this->db->where('ID',$arrayDetails['ID']); + $this->db->update(INCOMEOUTCOMEMASTER, $arrayDetails); + if($this->db->affected_rows() == '1'){ + $result['updateStatus'] = true; + $result['message'] = "Successfully day book details is updated"; + } + else { + $result['updateStatus'] = false; + $result['message'] = "Something went wrong.please try again"; + } + + } + + + + return $result; + + } + +} \ No newline at end of file diff --git a/Apollo/api/application/models/Studentview_model.php b/Apollo/api/application/models/Studentview_model.php index 9e191f72..990b69da 100644 --- a/Apollo/api/application/models/Studentview_model.php +++ b/Apollo/api/application/models/Studentview_model.php @@ -49,6 +49,153 @@ class Studentview_model extends CI_Model $this->db->join( BATCH . ' as BA', 'BA.BatchCode = SCU.BatchCode'); $this->db->where('SCU.StudentID', $studentId); $courseDetails = $this->db->get(); - return $courseDetails->result(); + if($courseDetails->result()){ + $studentCourseStatus['status'] = true; + foreach ($courseDetails->result() as $row){ + $fetchData['CourseID']=$row->CourseID; + $fetchData['CourseName']=$row->CourseName; + $fetchData['UniversityID']=$row->UniversityID; + $fetchData['UniversityName']=$row->UniversityName; + $fetchData['BatchName']=$row->BatchName; + // get student fees details + $fetchData['feesDetails']=$this->getStudentFeesDetails($studentId,$row->CourseID); + // get student boollet details + $fetchData['bookletDetails']=$this->getStudentBookletDetails($studentId,$row->CourseID); + // get certificate details + $fetchData['certificateDetails']=$this->getStudentCertificateDetails($studentId,$row->CourseID); + // get student application details + $fetchData['applicationDetails']=$this->getStudentApplicationDetails($studentId,$row->CourseID); + + $CourseArray[]=$fetchData; + + + } + $studentCourseStatus['courseStatus'] = $CourseArray; + } + else{ + $studentCourseStatus['status'] = false; + } + + return $studentCourseStatus; + } + + /* + * get student fees details + * created by kms + * */ + public function getStudentFeesDetails($studentID=null,$courseID=null){ + $this->db->distinct(); + $this->db->select('SFS.FeesID,SFS.FeesType,SFS.SessionName,SFS.RollNo,ifnull(SFS.CourseFees,0) as CourseFees,ifnull(SFS.STFOrWR,0) as STFOrWR,ifnull(SFS.Waiver,0) as Waiver,ifnull(SFS.Others,0) as Others,CF.Sem_Year'); + $this->db->from(STUDENTS_FEES_STATUS.' as SFS'); + $this->db->join(STUDENTS_FEES_PAID.' as SFP','SFP.FeesId = SFS.FeesID','left'); + $this->db->join(COURSE_FEES.' as CF', 'CF.ID = SFS.FeesType'); + $this->db->where('SFS.CourseID', $courseID); + $this->db->where('SFS.StudentID', $studentID); + $this->db->order_by('SFS.FeesID', 'ASC'); + $getFeeDetails = $this->db->get(); + if($getFeeDetails->result()){ + foreach ($getFeeDetails->result() as $feeRow){ + $storePaidDetails['FeesID'] = $feeRow->FeesID; + $storePaidDetails['FeesName'] = $feeRow->Sem_Year; + $storePaidDetails['CourseFees'] = $feeRow->CourseFees; + $storePaidDetails['SessionName'] = $feeRow->SessionName; + $storePaidDetails['RollNo'] = $feeRow->RollNo; + $storePaidDetails['STFOrWR'] = $feeRow->STFOrWR; + $storePaidDetails['Waiver'] = $feeRow->Waiver; + $storePaidDetails['Others'] = $feeRow->Others; + $storePaidDetails['PayableAmount'] = $feeRow->CourseFees+$feeRow->STFOrWR+$feeRow->Others-$feeRow->Waiver; + + $this->db->select('ifnull(SUM((BillAmount)),0) as PaidBillAmount'); + $this->db->where('FeesId',$feeRow->FeesID); + $paidBillAmount = $this->db->get(STUDENTS_FEES_PAID)->result(); + $storePaidDetails['PaidBillAmount']=$paidBillAmount[0]->PaidBillAmount; + if($paidBillAmount[0]->PaidBillAmount > $storePaidDetails['PayableAmount']){ + $storePaidDetails['BalanceAmount']=0; + + } + else{ + $storePaidDetails['BalanceAmount']=$storePaidDetails['PayableAmount'] - $paidBillAmount[0]->PaidBillAmount; + } + + // for get paid bill details + $this->db->select('ifnull(SUM((BillAmount)),0) as BillAmount,BillNO,BillDate,ModeOfPayment'); + $this->db->where('FeesId',$feeRow->FeesID); + $this->db->order_by('ID',"ASC"); + $this->db->group_by('BillNO'); + $storePaidDetails['paidDetails']=$this->db->get(STUDENTS_FEES_PAID)->result(); + $mergeResult[]=$storePaidDetails; + + } + + + return $mergeResult; + } + else { + return false; + } + + } + /* + * get student bool let details + * created by kms + * */ + public function getStudentBookletDetails($studentID=null,$courseID=null){ + $this->db->select('AB.AnsDate,AB.Comments,CF.Sem_Year,PLD.ListName'); + $this->db->from(ANSWER_BOOKLET.' as AB'); + $this->db->join(COURSE_FEES.' as CF','CF.ID = AB.CourseID'); + $this->db->join(COURSE.' as CU', 'CU.CourseID = CF.CourseID'); + $this->db->join(PICK_LIST_DETAILS.' as PLD', 'PLD.ListCode = AB.ListCode'); + $this->db->where('CU.CourseID', $courseID); + $this->db->where('AB.StudentID', $studentID); + $this->db->order_by('AB.ID', 'DESC'); + $getBoolDetails = $this->db->get(); + if ($getBoolDetails->result()){ + return $getBoolDetails->result(); + } + else{ + return false; + } + } + /* + * get student certificate details + * created by kms + * */ + public function getStudentCertificateDetails($studentID=null,$courseID=null){ + $this->db->select('CS.CertificationNo,CS.CDate,CS.Comments,CM.CertificateName,CF.Sem_Year,PLD.ListName'); + $this->db->from(CERTIFICATION_STATUS.' as CS'); + $this->db->join(CERTIFICATION_MASTER.' as CM','CM.CertificationID = CS.CertificationType'); + $this->db->join(COURSE_FEES.' as CF','CF.ID = CS.CourseID'); + $this->db->join(COURSE.' as CU', 'CU.CourseID = CF.CourseID'); + $this->db->join(PICK_LIST_DETAILS.' as PLD', 'PLD.ListCode = CS.ListCode'); + $this->db->where('CU.CourseID', $courseID); + $this->db->where('CS.StudentID', $studentID); + $this->db->order_by('CS.ID', 'DESC'); + $getCertDetails = $this->db->get(); + if ($getCertDetails->result()){ + return $getCertDetails->result(); + } + else{ + return false; + } + } + /* + * get student application details + * created by kms*/ + public function getStudentApplicationDetails($studentID=null,$courseID=null){ + $this->db->select('AS.AppDate,AS.Comments,CF.Sem_Year,PLD.ListName'); + $this->db->from(APPLICATION_STATUS.' as AS'); + $this->db->join(COURSE_FEES.' as CF','CF.ID = AS.CourseID'); + $this->db->join(COURSE.' as CU', 'CU.CourseID = CF.CourseID'); + $this->db->join(PICK_LIST_DETAILS.' as PLD', 'PLD.ListCode = AS.ListCode'); + $this->db->where('CU.CourseID', $courseID); + $this->db->where('AS.StudentID', $studentID); + $this->db->order_by('AS.ID', 'DESC'); + $getAppDetails = $this->db->get(); + if ($getAppDetails->result()){ + return $getAppDetails->result(); + } + else{ + return false; + } } } \ No newline at end of file diff --git a/Apollo/assets/i18n/en.json b/Apollo/assets/i18n/en.json index d9f9c1da..64ded76a 100755 --- a/Apollo/assets/i18n/en.json +++ b/Apollo/assets/i18n/en.json @@ -68,7 +68,8 @@ "ANNOUNCEMENT": "ANNOUNCEMENT DETAILS", "STATUS": "STATUS DETAILS", "STUDENTSTATUS": "DEFAULT STUDENT ACTIVITY", - "CERTIFICATETYPE": "CERTIFICATE TYPE" + "CERTIFICATETYPE": "CERTIFICATE TYPE", + "DAYBOOKMASTER":"DAY BOOK DETAILS" }, "student": { "MAIN": "MANAGE STUDENTS", diff --git a/Apollo/assets/js/config.constant.js b/Apollo/assets/js/config.constant.js index 305ce1d1..4193e431 100755 --- a/Apollo/assets/js/config.constant.js +++ b/Apollo/assets/js/config.constant.js @@ -155,6 +155,10 @@ app.constant('JS_REQUIRES', { 'studentStatusUpdateCtrl':'assets/js/controllers/studentStatusUpdateCtrl.js', 'studentViewCtrl':'assets/js/controllers/studentViewCtrl.js', + // day book master + 'dayBookMasterCtrl':'assets/js/controllers/dayBookMasterCtrl.js', + + //*** Filters 'htmlToPlaintext': 'assets/js/filters/htmlToPlaintext.js' }, diff --git a/Apollo/assets/js/config.router.js b/Apollo/assets/js/config.router.js index 36db4a14..44dbe43a 100755 --- a/Apollo/assets/js/config.router.js +++ b/Apollo/assets/js/config.router.js @@ -164,6 +164,14 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com title: 'Status', ncyBreadcrumb: { label: 'Status' + }, + }).state('app.master.dayBookMaster', { + url: '/day book master', + templateUrl: "assets/views/daybook/dayBookMaster.html", + resolve: loadSequence('dayBookMasterCtrl','ngTable', 'ladda', 'angular-ladda'), + title: 'Day Book Master', + ncyBreadcrumb: { + label: 'Day Book Master' }, }).state('app.master.certificateType', { url: '/certificates', diff --git a/Apollo/assets/js/controllers/callTrackingCtrl.js b/Apollo/assets/js/controllers/callTrackingCtrl.js index dd4be43c..290a80d4 100755 --- a/Apollo/assets/js/controllers/callTrackingCtrl.js +++ b/Apollo/assets/js/controllers/callTrackingCtrl.js @@ -456,9 +456,11 @@ app.controller('callTrackingCtrl2', ["$scope","$rootScope","toaster", "$filter", $rootScope.loadFollowupDetails($scope.nextTrack.TrackingID); } - /* else{ - $rootScope.loadFollowupDetails($scope.ListOfTracks[0].TrackingID); - }*/ + else{ + swal("EMPTY!", "This is an last tracking details.so please go previous", "info"); + + + } } @@ -618,10 +620,11 @@ app.controller('callTrackingCtrl2', ["$scope","$rootScope","toaster", "$filter", $rootScope.loadFollowupDetails($scope.prevTrack.TrackingID); } - /* else{ - console.log($scope.ListOfTracksForPre.length); - $rootScope.loadFollowupDetails($scope.ListOfTracksForPre[$scope.ListOfTracksForPre.length-1].TrackingID); - }*/ + else{ + swal("EMPTY!", "This is an last tracking details.so please go next", "info"); + + + } } diff --git a/Apollo/assets/js/controllers/dayBookMasterCtrl.js b/Apollo/assets/js/controllers/dayBookMasterCtrl.js new file mode 100644 index 00000000..b0da3021 --- /dev/null +++ b/Apollo/assets/js/controllers/dayBookMasterCtrl.js @@ -0,0 +1,208 @@ +'use strict'; +/** + * controllers for ng-table + * Simple table with sorting and filtering on AngularJS + */ +// var helloApp = angular.module("helloApp", []); +app.controller("dayBookMasterCtrl", ["$scope", "toaster", "$filter", "API_POINTS", "$localStorage", "$http", "$state", function ($scope, toaster, $filter, apiPoint, $localStorage, $http, $state) { + + $scope.myModel = { + "name": "", + "type": "", + "switchsetting": true + + }; + /* + * edit status details + * created by Surendiran + * */ + $scope.editId = -1; + $scope.setEditId = function (pid) { + $scope.editId = pid; + $scope.viewId = -1; + }; + + /* + * cancel edit div + * created by Surendiran + * */ + $scope.cancel = function () { + $scope.init(); + $scope.editId = -1; + + }; + + // sorting function for table params + $scope.sort = function(keyname){ + $scope.sortKey = keyname; //set the sortKey to the param passed + $scope.reverse = !$scope.reverse; //if true make it false and vice versa + } + + + $scope.dayForm = { + + submit: function (form, myModel,loading) { + + var firstError = null; + if (form.$invalid) { + var field = null, firstError = null; + for (field in form) { + if (field[0] != '$') { + if (firstError === null && !form[field].$valid) { + firstError = form[field].$name; + } + if (form[field].$pristine) { + form[field].$dirty = true; + } + } + } + angular.element('.ng-invalid[name=' + firstError + ']').focus(); + // swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error"); + } else { + + $scope.ldloading1 = {}; + + $scope.ldloading1[loading.replace('-', '_')] = true; + + + var addstatus = { + method: 'POST', + url: apiPoint.url + 'addDaybookMasterDetails/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + name: myModel.name, + type: myModel.type, + status: myModel.switchsetting, + createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID + } + }; + + $http(addstatus).then(function (response) { + if (response.data.status == 200 && response.data.addStatus) { + $scope.ldloading1[loading.replace('-', '_')] = false; + $scope.init(); + swal("Success!", response.data.message, "success"); + $state.go($state.current, {}, { reload: true }); + } else { + $scope.ldloading1[loading.replace('-', '_')] = false; + swal("Failed!", response.data.message, "error"); + } + }); + + + } + }, + + reset: function (form) { + + $scope.myModel = angular.copy($scope.master); + form.$setPristine(true); + $scope.myModel = { + "name": "", + "switchsetting": true, + "type": "" + }; + + } + }; + /* + *get day book details + * */ + + $scope.loader=''; + + $scope.emptyData=''; + + + $scope.init = function () { + + var getdetails = { + method: 'POST', + url: apiPoint.url + 'getDayBookMasterDetails/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID + } + }; + + $http(getdetails).then(function (response) { + $scope.dayBookType = response.data.getDayBooktype; + if (response.data.status==200 && response.data.daybookStatus) { + $scope.emptyData=true; + $scope.loader=true; + + $scope.dayBookInfo = response.data.details; + + } else { + $scope.emptyData=false; + $scope.loader=true; + + $scope.dayBookInfo=''; + + } + }); + }; + + /* + * update the day book details + * */ + $scope.updateDaybook = function (myModel, form, loading) { + + var firstError = null; + if (form.$invalid) { + var field = null, firstError = null; + for (field in form) { + if (field[0] != '$') { + if (firstError === null && !form[field].$valid) { + firstError = form[field].$stop_name; + } + + if (form[field].$pristine) { + form[field].$dirty = true; + } + } + } + angular.element('.ng-invalid[name=' + firstError + ']').focus(); + } else { + $scope.ldloading = {}; + + $scope.ldloading[loading.replace('-', '_')] = true; + + + var update = { + method: 'POST', + url: apiPoint.url + 'updateDayBookMasterDetails/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + ID: myModel.ID, + TypeID: myModel.TypeID, + TypeName: myModel.TypeName, + status: myModel.IsActive, + updatedBy: JSON.parse(localStorage.getItem('localObj')).localUserID + } + }; + $http(update).then(function (response) { + if (response.data.status==200 && response.data.updateStatus) { + $scope.ldloading[loading.replace('-', '_')] = false; + swal("Success!", response.data.message, "success"); + $scope.editId = -1; + $scope.init(); + + } else { + $scope.ldloading[loading.replace('-', '_')] = false; + swal("Failed!", response.data.message, "error"); + } + }); + + } + }; + + + +}]); \ No newline at end of file diff --git a/Apollo/assets/js/controllers/studentViewCtrl.js b/Apollo/assets/js/controllers/studentViewCtrl.js index ef9b3964..19b0cdf8 100644 --- a/Apollo/assets/js/controllers/studentViewCtrl.js +++ b/Apollo/assets/js/controllers/studentViewCtrl.js @@ -41,3 +41,58 @@ app.controller('studentViewCtrl', ["$scope","$rootScope", "toaster", "$filter", }]); +/*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'); + }; + + +}]); + diff --git a/Apollo/assets/views/callTrackingFollowup.html b/Apollo/assets/views/callTrackingFollowup.html index e25a21e9..666a4718 100755 --- a/Apollo/assets/views/callTrackingFollowup.html +++ b/Apollo/assets/views/callTrackingFollowup.html @@ -169,12 +169,12 @@
diff --git a/Apollo/assets/views/daybook/dayBookMaster.html b/Apollo/assets/views/daybook/dayBookMaster.html new file mode 100644 index 00000000..1dfc039d --- /dev/null +++ b/Apollo/assets/views/daybook/dayBookMaster.html @@ -0,0 +1,145 @@ + +
+
+
+

+ +
+
+
+
+
+
+
+
+ Add Day Book Details +
+ +
+ +
+
+ + + Type is required + + +
+ +
+ + + + Name is required + Invalid name + + +
+ +
+
+ + +
+
+ +
+ + +
+
+
+ +
+
+ +
+ +

+
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + +
Name + + + Type + + + Status
{{p.TypeName}}{{p.ListName}}ActiveDe-Active + + + +
+ + +
+
\ No newline at end of file diff --git a/Apollo/assets/views/daybook/editDayBookMaster.html b/Apollo/assets/views/daybook/editDayBookMaster.html new file mode 100644 index 00000000..68737124 --- /dev/null +++ b/Apollo/assets/views/daybook/editDayBookMaster.html @@ -0,0 +1,78 @@ +
+
+
+
+
+ + Update Day Book Details + + +
+
+ + + Type is required + + +
+ + +
+ + + + Name is required + Invalid name + +
+
+ +
+ + + +
+
+ + +
+ +
+ +
+ +
+
+
+
+ + + + + +
+
+
+ +
+
+
+ \ No newline at end of file diff --git a/Apollo/assets/views/partials/nav.html b/Apollo/assets/views/partials/nav.html index 24a706b5..1413ba0c 100755 --- a/Apollo/assets/views/partials/nav.html +++ b/Apollo/assets/views/partials/nav.html @@ -74,6 +74,11 @@ Announcement DETAILS +
  • + + DAY BOOK DETAILS + +
    • @@ -381,7 +386,7 @@