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

Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec

Browse Source
This commit is contained in:
dineshkumarkannan 2018-04-26 09:51:46 +05:30
commit 118c65bde2
11 changed files with 157 additions and 213 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Apollo/api/application/controllers/Branch_Controller.php
View File

@ -62,6 +62,7 @@ class Branch_Controller extends REST_Controller {
$details['CreatedBy'] = $this->post('createdBy'); $details['CreatedBy'] = $this->post('createdBy');
$details['IsActive'] = $this->post('status') == "true" ? 1 : 0; $details['IsActive'] = $this->post('status') == "true" ? 1 : 0;
$details['CreatedOn'] = $now->format('Y-m-d H:i:s'); $details['CreatedOn'] = $now->format('Y-m-d H:i:s');
$details['FeesReceiptTitle'] = $this->post('feesTitle');
$imageStat = $this->post('imageStatus'); $imageStat = $this->post('imageStatus');
@ -132,6 +133,7 @@ class Branch_Controller extends REST_Controller {
$details['IsActive'] = $this->post('status') == "true" ? 1 : 0; $details['IsActive'] = $this->post('status') == "true" ? 1 : 0;
$details['UpdatedBy'] = $this->post('createdBy'); $details['UpdatedBy'] = $this->post('createdBy');
$details['UpdatedOn'] = $now->format("Y-m-d H:i:s"); $details['UpdatedOn'] = $now->format("Y-m-d H:i:s");
$details['FeesReceiptTitle'] = $this->post('feesTitle');
$imageStat = $this->post('imageStatus'); $imageStat = $this->post('imageStatus');

2
Apollo/api/application/models/Branch_model.php
View File

@ -63,7 +63,7 @@ class Branch_model extends CI_Model {
public function getBranch() public function getBranch()
{ {
$this->db->select('BranchCode,BranchName,LogoPath,MobileNumber,AlternateNumber,LandlineNumber,Address,EmailID,CreatedOn,IsActive'); $this->db->select('BranchCode,BranchName,LogoPath,MobileNumber,AlternateNumber,LandlineNumber,Address,EmailID,CreatedOn,IsActive,FeesReceiptTitle as feesTitle');
$this->db->order_by('CreatedOn','DESC'); $this->db->order_by('CreatedOn','DESC');
$branchDetails = $this->db->get(BRANCH); $branchDetails = $this->db->get(BRANCH);

106
Apollo/api/application/models/Fees_status_model.php
View File

@ -326,7 +326,7 @@ class Fees_status_model extends CI_Model
$storePaidDetails['StudentPaidAmount']=$studentPaidAmount[0]->StudentPaidAmount; $storePaidDetails['StudentPaidAmount']=$studentPaidAmount[0]->StudentPaidAmount;
// for get paid bill details // for get paid bill details
$this->db->select('ifnull(SUM((BillAmount)),0) as BillAmount,BillNO,BillDate,ModeOfPayment,ReceiptNo,BR.BranchName,BR.Address,BR.LogoPath,STF.Firstname as ReceivedBy'); $this->db->select('ifnull(SUM((BillAmount)),0) as BillAmount,BillNO,BillDate,ModeOfPayment,ReceiptNo,BR.BranchName,BR.Address,BR.LogoPath,BR.FeesReceiptTitle,STF.Firstname as ReceivedBy');
$this->db->from(STUDENTS_FEES_PAID.' as SFP'); $this->db->from(STUDENTS_FEES_PAID.' as SFP');
$this->db->join(BRANCH.' as BR','BR.BranchCode = SFP.UpdatedBy','left'); $this->db->join(BRANCH.' as BR','BR.BranchCode = SFP.UpdatedBy','left');
$this->db->join(LOGIN.' as LO','LO.ID = SFP.CreatedBy'); $this->db->join(LOGIN.' as LO','LO.ID = SFP.CreatedBy');
@ -1461,116 +1461,12 @@ class Fees_status_model extends CI_Model
$insertfollowup_Details['CreatedBy'] = $arrayDetails['CreatedBy']; $insertfollowup_Details['CreatedBy'] = $arrayDetails['CreatedBy'];
$insertfollowup_Details['CreatedOn'] = $arrayDetails['CreatedOn']; $insertfollowup_Details['CreatedOn'] = $arrayDetails['CreatedOn'];
$this->db->insert(LEAD_TRACKING_FOLLOWUP, $insertfollowup_Details); $this->db->insert(LEAD_TRACKING_FOLLOWUP, $insertfollowup_Details);
// this if for insert follow up details
} }
} }
// hide call track update code
/*$this->db->select('LD.LeadID,LT.TrackingID');
$this->db->from(LEAD_DETAILS.' as LD');
$this->db->join(LEAD_TRACKING.' as LT', 'LT.LeadID = LD.LeadID');
$this->db->where('LD.MobileNumber',$arrayDetails['MobileNumber']);
$this->db->where('LT.ActivityStatus',$activityDetails->ActivityID);
$this->db->like('LT.University',$arrayDetails['University'],'after');
$this->db->like('LT.Course',$arrayDetails['Course'],'after');
$leadDet=$this->db->get()->last_row();
if($leadDet){
$this->db->select('FollowupOn');
$this->db->where('TrackingID',$leadDet->TrackingID);
$existFollowupOn = $this->db->get(LEAD_TRACKING_FOLLOWUP)->last_row();
// upate tracking status
$changeStatusCode['StatusCode'] = $arrayDetails['StatusCode'];
$changeStatusCode['UpdatedBy'] = $arrayDetails['CreatedBy'];
$changeStatusCode['UpdatedOn'] = $arrayDetails['CreatedOn'];
$changeStatusCode['CreatedBranch']=$arrayDetails['CreatedBranch'];
$this->db->where('TrackingID',$leadDet->TrackingID);
$this->db->update(LEAD_TRACKING, $changeStatusCode);
// end update status
$updateTrackDetails['TrackingID'] = $leadDet->TrackingID;
$updateTrackDetails['FollowupOn'] = $arrayDetails['FollowupOn'];
$updateTrackDetails['FollowupComments'] = $arrayDetails['FollowupComments'];
$updateTrackDetails['CreatedBy'] = $arrayDetails['CreatedBy'];
$updateTrackDetails['CreatedOn'] = $arrayDetails['CreatedOn'];
$this->db->insert(LEAD_TRACKING_FOLLOWUP, $updateTrackDetails);
}
else{
$this->db->select('LeadID');
$this->db->where('MobileNumber',$arrayDetails['MobileNumber']);
$checkLeadDet=$this->db->get(LEAD_DETAILS)->last_row();
if($checkLeadDet){
$updateLeadDetails['LeadID'] = $checkLeadDet->LeadID;
$updateLeadDetails['ActivityStatus'] = $activityDetails->ActivityID;
$updateLeadDetails['University'] = $arrayDetails['University'];
$updateLeadDetails['Course'] = $arrayDetails['Course'];
$updateLeadDetails['AssignedTo'] = $arrayDetails['CreatedBy'];
$updateLeadDetails['StatusCode'] = $arrayDetails['StatusCode'];
$updateLeadDetails['CreatedBy'] = $arrayDetails['CreatedBy'];
$updateLeadDetails['CreatedOn'] = $arrayDetails['CreatedOn'];
$updateLeadDetails['CreatedBranch']=$arrayDetails['CreatedBranch'];
$this->db->insert(LEAD_TRACKING, $updateLeadDetails);
// this if for insert tracking details
if($this->db->affected_rows() == '1'){
$followup_Details['TrackingID']=$this->db->insert_id();
$followup_Details['FollowupOn']=$arrayDetails['FollowupOn'];
$followup_Details['FollowupComments']=$arrayDetails['FollowupComments'];
$followup_Details['CreatedBy'] = $arrayDetails['CreatedBy'];
$followup_Details['CreatedOn'] = $arrayDetails['CreatedOn'];
$this->db->insert(LEAD_TRACKING_FOLLOWUP, $followup_Details);
// this if for insert follow up details
}
}
else{
$newLeadDetails['MobileNumber'] = $arrayDetails['MobileNumber'];
$newLeadDetails['LeadName'] = $arrayDetails['LeadName'];
$newLeadDetails['CreatedBy'] = $arrayDetails['CreatedBy'];
$newLeadDetails['CreatedOn'] = $arrayDetails['CreatedOn'];
$this->db->insert(LEAD_DETAILS, $newLeadDetails);
// this if for insert lead details
if($this->db->affected_rows() == '1'){
// get and store insert id from db
$track_Details['LeadID']=$this->db->insert_id();
$track_Details['ActivityStatus'] = $activityDetails->ActivityID;
$track_Details['University'] = $arrayDetails['University'];
$track_Details['Course'] = $arrayDetails['Course'];
$track_Details['AssignedTo'] = $arrayDetails['CreatedBy'];
$track_Details['StatusCode'] = $arrayDetails['StatusCode'];
$track_Details['CreatedBy'] = $arrayDetails['CreatedBy'];
$track_Details['CreatedOn'] = $arrayDetails['CreatedOn'];
$track_Details['CreatedBranch']=$arrayDetails['CreatedBranch'];
$this->db->insert(LEAD_TRACKING, $track_Details);
// this if for insert tracking details
if($this->db->affected_rows() == '1'){
$insertfollowup_Details['TrackingID']=$this->db->insert_id();
$insertfollowup_Details['FollowupOn']=$arrayDetails['FollowupOn'];
$insertfollowup_Details['FollowupComments']=$arrayDetails['FollowupComments'];
$insertfollowup_Details['CreatedBy'] = $arrayDetails['CreatedBy'];
$insertfollowup_Details['CreatedOn'] = $arrayDetails['CreatedOn'];
$this->db->insert(LEAD_TRACKING_FOLLOWUP, $insertfollowup_Details);
// this if for insert follow up details
}
}
}
}*/
} }
} }

12
Apollo/api/application/models/Student_model.php
View File

@ -1269,15 +1269,17 @@ class Student_model extends CI_Model
$this->db->where('PLD.ListName','PENDING'); $this->db->where('PLD.ListName','PENDING');
$this->db->where('AC.IsActive','1'); $this->db->where('AC.IsActive','1');
$this->db->where('AS.IsActive','1'); $this->db->where('AS.IsActive','1');
$this->db->where('AC.BranchCode',$localdata['localBranchID']);
$this->db->where('PLD.BranchCode',$localdata['localBranchID']);
$checkApplicationStatus=$this->db->get()->last_row(); $checkApplicationStatus=$this->db->get()->last_row();
if($checkApplicationStatus){ if($checkApplicationStatus){
$studentDetails = $this->studentInfoForDocumentStatus($fromDetails); $studentDetails = $this->studentInfoForDocumentStatus($fromDetails,$localdata);
if($studentDetails){ if($studentDetails){
$arrayDetails['MobileNumber']=$studentDetails->MobileNumber; $arrayDetails['MobileNumber']=$studentDetails->MobileNumber;
$arrayDetails['LeadName']=$studentDetails->Firstname; $arrayDetails['LeadName']=$studentDetails->Firstname;
$arrayDetails['University']=""; $arrayDetails['University']=$studentDetails->UniversityName;;
$arrayDetails['Course']=""; $arrayDetails['Course']=$studentDetails->CourseName;;
$arrayDetails['ActivityStatus'] = $checkApplicationStatus->ActivityID;; $arrayDetails['ActivityStatus'] = $checkApplicationStatus->ActivityID;;
$arrayDetails['StatusCode']=$checkApplicationStatus->ListCode; $arrayDetails['StatusCode']=$checkApplicationStatus->ListCode;
$arrayDetails['CreatedBranch']=$localdata['localBranchID']; $arrayDetails['CreatedBranch']=$localdata['localBranchID'];
@ -1358,7 +1360,7 @@ class Student_model extends CI_Model
* get student info for documet updates * get student info for documet updates
* created by kms * created by kms
* */ * */
public function studentInfoForDocumentStatus($details=null){ public function studentInfoForDocumentStatus($details=null,$localdata=null){
$this->db->select('ST.Firstname,ST.MobileNumber,US.UniversityName,CU.CourseName'); $this->db->select('ST.Firstname,ST.MobileNumber,US.UniversityName,CU.CourseName');
$this->db->from(STUDENTCOURSE.' as STC'); $this->db->from(STUDENTCOURSE.' as STC');
@ -1366,8 +1368,10 @@ class Student_model extends CI_Model
$this->db->join(COURSE.' as CU', 'CU.CourseID = STC.CourseID'); $this->db->join(COURSE.' as CU', 'CU.CourseID = STC.CourseID');
$this->db->join(UNIVERSITY.' as US', 'US.UniversityID = STC.UniversityID'); $this->db->join(UNIVERSITY.' as US', 'US.UniversityID = STC.UniversityID');
$this->db->where('ST.StudentID',$details['StudentID']); $this->db->where('ST.StudentID',$details['StudentID']);
$this->db->where('US.BranchCode',$localdata['localBranchID']);
// $this->db->where('STC.CourseID',$details[0]['CourseID']); // $this->db->where('STC.CourseID',$details[0]['CourseID']);
$leadDet=$this->db->get()->last_row(); $leadDet=$this->db->get()->last_row();
if($leadDet){ if($leadDet){
return $leadDet; return $leadDet;
} }

6
Apollo/assets/js/controllers/branchCtrl.js
View File

@ -14,7 +14,8 @@ app.controller('branchCtrl', ["$scope","toaster", "$filter", "ngTableParams", "A
"landLine": "", "landLine": "",
"address": "", "address": "",
"logo": "", "logo": "",
"switchsetting": true "switchsetting": true,
"feesTitle":""
}; };
/* /*
@ -131,7 +132,7 @@ app.controller('branchCtrl', ["$scope","toaster", "$filter", "ngTableParams", "A
formData.append("landLine", myModel.landLine); formData.append("landLine", myModel.landLine);
formData.append("address", myModel.address); formData.append("address", myModel.address);
formData.append("status", myModel.switchsetting); formData.append("status", myModel.switchsetting);
formData.append("feesTitle", myModel.feesTitle);
var checkImg = logo == undefined ? 0 : 1; var checkImg = logo == undefined ? 0 : 1;
formData.append("imageStatus", checkImg); formData.append("imageStatus", checkImg);
@ -282,6 +283,7 @@ app.controller('branchCtrl', ["$scope","toaster", "$filter", "ngTableParams", "A
formData.append("address", myModel.Address); formData.append("address", myModel.Address);
formData.append("status", myModel.IsActive); formData.append("status", myModel.IsActive);
formData.append("logo", myModel.LogoPath); formData.append("logo", myModel.LogoPath);
formData.append("feesTitle", myModel.feesTitle);
var checkImg = logoEdit == undefined ? 0 : 1; var checkImg = logoEdit == undefined ? 0 : 1;
formData.append("imageStatus", checkImg); formData.append("imageStatus", checkImg);

4
Apollo/assets/js/controllers/feesStatusCtrl.js
View File

@ -2608,8 +2608,8 @@ app.controller('FeesModalInstanceCtrl', ["$scope", "$modalInstance", "items","Wo
$scope.branchName = ""; $scope.branchName = "";
$scope.ReceivedBy = ""; $scope.ReceivedBy = "";
$scope.BranchAddr = ""; $scope.BranchAddr = "";
$scope.BranchAddr = "";
$scope.BranchLogo = ""; $scope.BranchLogo = "";
$scope.FeesReceiptTitle = "";
$scope.ShowHide = function (pdfValue) { $scope.ShowHide = function (pdfValue) {
$scope.showButton = true; $scope.showButton = true;
$scope.billNo = pdfValue.BillNO; $scope.billNo = pdfValue.BillNO;
@ -2621,6 +2621,7 @@ app.controller('FeesModalInstanceCtrl', ["$scope", "$modalInstance", "items","Wo
$scope.ReceivedBy = pdfValue.ReceivedBy; $scope.ReceivedBy = pdfValue.ReceivedBy;
$scope.BranchAddr = pdfValue.Address; $scope.BranchAddr = pdfValue.Address;
$scope.BranchLogo = pdfValue.LogoPath; $scope.BranchLogo = pdfValue.LogoPath;
$scope.FeesReceiptTitle = pdfValue.FeesReceiptTitle;
} }
@ -2637,6 +2638,7 @@ app.controller('FeesModalInstanceCtrl', ["$scope", "$modalInstance", "items","Wo
$scope.ReceivedBy=""; $scope.ReceivedBy="";
$scope.BranchAddr = ""; $scope.BranchAddr = "";
$scope.BranchLogo = ""; $scope.BranchLogo = "";
$scope.FeesReceiptTitle="";
} }
}]); }]);

3
Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js
View File

@ -308,7 +308,8 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
}, },
data: { data: {
requestedBy :studentDetails.MobileNumber, requestedBy :studentDetails.MobileNumber,
requestedFrom: 3 requestedFrom: 3,
branchCode:JSON.parse(localStorage.getItem('localObj')).localBranchID
} }
}; };
$http(getcourse).then(function (response) { $http(getcourse).then(function (response) {

3
Apollo/assets/js/controllers/studentCtrl.js
View File

@ -3046,7 +3046,8 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
}, },
data: { data: {
requestedBy: studentDetails.StudentID, requestedBy: studentDetails.StudentID,
requestedFrom: 1 requestedFrom: 1,
branchCode:JSON.parse(localStorage.getItem('localObj')).localBranchID
} }
}; };
$http(getcourse).then(function (response) { $http(getcourse).then(function (response) {

90
Apollo/assets/views/branchDetails.html
View File

@ -5,6 +5,16 @@
box-shadow: 0px 0px 2px #007AFF; box-shadow: 0px 0px 2px #007AFF;
padding: 0.5em 0.6em; padding: 0.5em 0.6em;
} }
.thumb {
width: 130px;
height: 140px;
margin: 2px;
float: left;
}
.uploader {
clear: both;
}
</style> </style>
<!-- start: PAGE TITLE --> <!-- start: PAGE TITLE -->
<section id="page-title"> <section id="page-title">
@ -156,7 +166,7 @@
Branch Code <span class="symbol required"></span> Branch Code <span class="symbol required"></span>
</label> </label>
<input type="text" placeholder="Enter Branch Code" tabindex="1" class="form-control" name="branchcode" ng-model="myModel.branchCode" <input disallow-spaces type="text" placeholder="Enter Branch Code" tabindex="1" class="form-control" id="branchcode" name="branchcode" ng-model="myModel.branchCode"
ng-pattern="/^[a-zA-Z0-9.\s]*$/" required/> ng-pattern="/^[a-zA-Z0-9.\s]*$/" required/>
<span class="error text-small block" ng-if="Form.branchcode.$dirty && Form.branchcode.$error.required">Branch code is required</span> <span class="error text-small block" ng-if="Form.branchcode.$dirty && Form.branchcode.$error.required">Branch code is required</span>
<span class="error text-small block" ng-if="Form.branchcode.$dirty && Form.branchcode.$error.pattern">Invalid branch code </span> <span class="error text-small block" ng-if="Form.branchcode.$dirty && Form.branchcode.$error.pattern">Invalid branch code </span>
@ -234,6 +244,22 @@
<!--<span class="success text-small"--> <!--<span class="success text-small"-->
<!--ng-if="Form.address.$valid">Thank You!</span>--> <!--ng-if="Form.address.$valid">Thank You!</span>-->
</div> </div>
<div class="col-md-4 form-group"
ng-class="{'has-error':Form.feesTitle.$dirty && Form.feesTitle.$invalid, 'has-success':Form.feesTitle.$valid}">
<label>
Fees Receipt Title <span class="symbol required"></span>
</label>
<input type="text" capitalize placeholder="Enter Fees Receipt Title"
tabindex="8" class="form-control" name="feesTitle"
ng-model="myModel.feesTitle" ng-pattern="/^[a-zA-Z0-9-._()/\s]*$/" required/>
<span class="error text-small block"
ng-if="Form.feesTitle.$dirty && Form.feesTitle.$error.required">Fees receipt title is required</span>
<span class="error text-small block"
ng-if="Form.feesTitle.$dirty && Form.feesTitle.$error.pattern">Invalid Fees receipt title </span>
<!--<span class="success text-small"-->
<!--ng-if="Form.feesTitle.$valid">Thank You!</span>-->
</div>
<div class="col-md-4"> <div class="col-md-4">
<label> <label>
Active/De-Active Active/De-Active
@ -257,52 +283,42 @@
</div> </div>
<div class="col-md-3"> </div>
<form name="Form" id="form1" novalidate ng-submit="form.submit(Form,myModel)" method="post"> <div class="row">
<div class="file-upload"> <div class="col-md-6">
<div class="row"> <form name="Form" id="form1" novalidate ng-submit="form.submit(Form,myModel)" method="post">
<div class="col-md-6"> <div class="file-upload">
<div class="row">
<div class="col-md-6">
<div class="form-group"> <div class="form-group">
<div class="user-image"> <div class="user-image">
<h5>Branch Logo</h5> <h5>Branch Logo</h5>
<div class=" margin-bottom-5"> <div class=" margin-bottom-5">
</div>
</div> </div>
<!--<input type="file" file-model="idProof" </div>
accept="image/*" onchange="angular.element(this).scope().imageUpload(event)"/>--> <!--<input type="file" file-model="idProof"
<div> accept="image/*" onchange="angular.element(this).scope().imageUpload(event)"/>-->
<div ng-repeat="step in stepsModel"> <div>
<!--<a class="close-thin"></a>--> <div ng-repeat="step in stepsModel">
<img class="thumb" ng-src="{{step}}" /> <!--<a class="close-thin"></a>-->
<div class="col-md-12"> <img class="thumb" ng-src="{{step}}" />
<div class="pull-right"> <div class="col-md-12">
<button class="btn btn-success btn-o btn-sm margin-right-15" type="button" ng-click="resetImage()">Reset <div class="pull-right">
</button> <button class="btn btn-success btn-o btn-sm margin-right-15" type="button" ng-click="resetImage()">Reset
</div> </button>
</div> </div>
</div> </div>
</div> </div>
<input type="file" accept="image/*" file-upload onchange="angular.element(this).scope().imageUpload(event)" />
<style>
.thumb {
width: 130px;
height: 140px;
margin: 18px;
float: left;
}
.uploader {
clear: both;
}
</style>
</div> </div>
<input type="file" accept="image/*" file-upload onchange="angular.element(this).scope().imageUpload(event)" />
</div> </div>
</div> </div>
</div> </div>
</form> </div>
</div> </form>
</div>
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
<div class="pull-right"> <div class="pull-right">

136
Apollo/assets/views/editBranchDetails.html
View File

@ -1,3 +1,17 @@
<style>
.thumb {
width: 130px;
height: 140px;
margin: 2px;
float: left;
}
.prof {
border: 2px solid #2C3543;
}
.uploader {
clear: both;
}
</style>
<form name="Form" id="form" novalidate> <form name="Form" id="form" novalidate>
<div class="row"> <div class="row">
@ -16,7 +30,7 @@
Branch Code <span class="symbol required"></span> Branch Code <span class="symbol required"></span>
</label> </label>
<input type="text" placeholder="Enter Branch Code" <input type="text" disallow-spaces placeholder="Enter Branch Code"
tabindex="1" class="form-control" name="branchcode" tabindex="1" class="form-control" name="branchcode"
ng-model="p.BranchCode" ng-pattern="/^[a-zA-Z0-9.\s]*$/" readonly required/> ng-model="p.BranchCode" ng-pattern="/^[a-zA-Z0-9.\s]*$/" readonly required/>
<span class="error text-small block" <span class="error text-small block"
@ -132,7 +146,23 @@
<!--<span class="success text-small"--> <!--<span class="success text-small"-->
<!--ng-if="Form.address.$valid">Thank You!</span>--> <!--ng-if="Form.address.$valid">Thank You!</span>-->
</div> </div>
<div class="col-md-2"> <div class="col-md-4 form-group"
ng-class="{'has-error':Form.editfeesTitle.$dirty && Form.editfeesTitle.$invalid, 'has-success':Form.editfeesTitle.$valid}">
<label>
Fees Receipt Title <span class="symbol required"></span>
</label>
<input type="text" capitalize placeholder="Enter Fees Receipt Title"
tabindex="8" class="form-control" name="editfeesTitle"
ng-model="p.feesTitle" ng-pattern="/^[a-zA-Z0-9-._()/\s]*$/" required/>
<span class="error text-small block"
ng-if="Form.editfeesTitle.$dirty && Form.editfeesTitle.$error.required">Fees receipt title is required</span>
<span class="error text-small block"
ng-if="Form.editfeesTitle.$dirty && Form.editfeesTitle.$error.pattern">Invalid Fees receipt title </span>
<!--<span class="success text-small"-->
<!--ng-if="Form.editfeesTitle.$valid">Thank You!</span>-->
</div>
<div class="col-md-4">
<label> <label>
Active/De-Active Active/De-Active
</label> </label>
@ -147,73 +177,63 @@
</div> </div>
</div> </div>
</div>
<div class="row">
<div class="col-md-2"> <div class="col-md-2">
<img class="thumb prof" ng-src="images/{{p.LogoPath}}" /> <img class="thumb prof" ng-src="images/{{p.LogoPath}}" />
<style>
.thumb { </div>
width: 130px; <div class="col-md-8">
height: 140px; <form name="Form" id="form1" novalidate ng-submit="form.submit(Form,myModel)" method="post">
margin: 18px; <div class="file-upload">
float: left; <div class="row">
} <div class="col-md-4">
.prof { <h5>Update Logo</h5>
border: 2px solid #2C3543; <div class=" margin-bottom-5">
}
.uploader {
clear: both;
}
</style>
</div>
<div class="col-md-4">
<form name="Form" id="form1" novalidate ng-submit="form.submit(Form,myModel)" method="post">
<div class="file-upload">
<div class="row">
<div class="col-md-4">
<h5>Update Logo</h5>
<div class=" margin-bottom-5">
</div>
<input type="file" accept="image/*" ng-init="resetImageEdit()" file-upload-edit onchange="angular.element(this).scope().imageUploadEdit(event)"
/>
</div> </div>
<div class="col-md-2"> <input type="file" accept="image/*" ng-init="resetImageEdit()" file-upload-edit onchange="angular.element(this).scope().imageUploadEdit(event)"
<div class="form-group"> />
<div class="user-image"> </div>
</div> <div class="col-md-4">
<!--<input type="file" file-model="idProof" <div class="form-group">
accept="image/*" onchange="angular.element(this).scope().imageUpload(event)"/>--> <div class="user-image">
</div>
<!--<input type="file" file-model="idProof"
accept="image/*" onchange="angular.element(this).scope().imageUpload(event)"/>-->
<div> <div>
<div ng-repeat="step in stepsModelEdit"> <div ng-repeat="step in stepsModelEdit">
<!--<a class="close-thin"></a>--> <!--<a class="close-thin"></a>-->
<img class="thumb" ng-src="{{step}}" /> <img class="thumb" ng-src="{{step}}" />
<div class="col-md-12"> <div class="col-md-12">
<div class="pull-right"> <div class="pull-right">
<button class="btn btn-success btn-o btn-sm margin-right-15" type="button" ng-click="resetImageEdit()">Reset <button class="btn btn-success btn-o btn-sm margin-right-15" type="button" ng-click="resetImageEdit()">Reset
</button> </button>
</div>
</div> </div>
</div> </div>
</div> </div>
<style>
.thumb {
width: 130px;
height: 140px;
margin: 18px;
float: left;
}
.uploader {
clear: both;
}
</style>
</div> </div>
<!--<style>
.thumb {
width: 130px;
height: 140px;
margin: 18px;
float: left;
}
.uploader {
clear: both;
}
</style>-->
</div> </div>
</div> </div>
</div> </div>
</form> </div>
</div> </form>
</div>
</div> </div>
</fieldset> </fieldset>

6
Apollo/assets/views/status-update/updateFeesStatus.html
View File

@ -531,10 +531,10 @@
<img flow-img="obj.flow.files[0]" ng-if="obj.flow.files.length">--> <img flow-img="obj.flow.files[0]" ng-if="obj.flow.files.length">-->
</div> </div>
</td> </td>
<td style="width: 136px; height: 23px; text-align: center; border-bottom-style: hidden; color: white; background-color: black; font-size: 20px;" colspan="3"><strong>APOLLO DISTANCE EDUCATION COLLEGE</strong> <td style="width: 136px; height: 23px; text-align: center; border-bottom-style: hidden; color: white; background-color: black; font-size: 20px;" colspan="3"><strong><!--APOLLO DISTANCE EDUCATION COLLEGE-->{{FeesReceiptTitle}}</strong>
</br> </br>
<span style="font-size: 16px;">(A Group of SVE Trust)</span> <!--<span style="font-size: 16px;">(A Group of SVE Trust)</span>
</br> </br>-->
<span style="font-size: 16px;">{{BranchAddr}}</span> <span style="font-size: 16px;">{{BranchAddr}}</span>
</td> </td>
</tr> </tr>