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:
velz 2018-08-22 16:26:33 +05:30
commit 481f8afe32
4 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -610,7 +610,7 @@ class StatusUpdation_model extends CI_Model {
$htmlContent = $msg; $htmlContent = $msg;
// Email body load the html template // Email body load the html template
// $body = $this->load->view('emails/anillabs.php',$data,TRUE); // $body = $this->load->view('emails/anillabs.php',$data,TRUE);
$this->email->to('dineshkumar.k@venbainfotech.com'); $this->email->to($list);
$this->email->from('noreply@apollodec.com','Apollo'); $this->email->from('noreply@apollodec.com','Apollo');
$subj = $sub; $subj = $sub;
$this->email->subject($subj); $this->email->subject($subj);

2
Apollo/assets/js/controllers/certificateStatusCtrl.js
View File

@ -28,7 +28,7 @@ app.controller('certificateStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
var localDetail = JSON.parse(localStorage.getItem('localObj')); var localDetail = JSON.parse(localStorage.getItem('localObj'));
var localDetails = ipCookie('cookiechk'); var localDetails = ipCookie('cookiechk');
const localUpdateStatus = 'CERTIFICATE_STATUS'; const localUpdateStatus = 'APPICATION_STATUS';
$scope.localTypeSuperAdmin = false; $scope.localTypeSuperAdmin = false;
$scope.localBranchDetails = ''; $scope.localBranchDetails = '';

14
Apollo/assets/views/newreg_report.html
View File

@ -164,13 +164,12 @@
<table id="datatable" class="table table-hover"> <table id="datatable" class="table table-hover">
<thead> <thead>
<tr > <tr >
<th style="font-size: 12px;">Date Of Registration</th>
<th style="font-size: 12px;">Student Name</th> <th style="font-size: 12px;">Student Name</th>
<th style="font-size: 12px;">Father Name</th> <th style="font-size: 12px;">Father Name</th>
<th style="font-size: 12px;">Course</th>
<th style="font-size: 12px;">Batch</th>
<th style="font-size: 12px">University</th> <th style="font-size: 12px">University</th>
<th style="font-size: 12px;">Date Of Registration</th> <th style="font-size: 12px;">Batch</th>
<th style="font-size: 12px;">Course</th>
<th style="font-size: 12px;">Mobile</th> <th style="font-size: 12px;">Mobile</th>
<!-- <th style="font-size: 12px;">Amount</th> <!-- <th style="font-size: 12px;">Amount</th>
<th style="font-size: 12px;">Action</th> --> <th style="font-size: 12px;">Action</th> -->
@ -178,13 +177,12 @@
</thead> </thead>
<tbody dir-paginate="p in newreglist|filter:search:strict|itemsPerPage:10"> <tbody dir-paginate="p in newreglist|filter:search:strict|itemsPerPage:10">
<tr> <tr>
<td>{{p.DOJ}}</td>
<td>{{p.Firstname}}</td> <td>{{p.Firstname}}</td>
<td>{{p.Fathername}}</td> <td>{{p.Fathername}}</td>
<td>{{p.CourseName}}</td>
<td>{{p.BatchName}}</td>
<td>{{p.UniversityName}}</td> <td>{{p.UniversityName}}</td>
<td>{{p.DOJ}}</td> <td>{{p.BatchName}}</td>
<td>{{p.CourseName}}</td>
<td>{{p.MobileNumber}}</td> <td>{{p.MobileNumber}}</td>
</tr> </tr>

8
Apollo/assets/views/reregistration/reregistrationformpdf.html
View File

@ -6,10 +6,10 @@
<table style="height: 341px;background-color: white;border-collapse: collapse; color: black;" border="1" width="100%"> <table style="height: 341px;background-color: white;border-collapse: collapse; color: black;" border="1" width="100%">
<tbody> <tbody>
<tr> <tr>
<td style="width: 253px; text-align: left;border-right-style: hidden;border-bottom-style: hidden;"><img src="images/{{Course.ProfilePicPath || university/No_Image.png}}" id="logo" style="width: 30%;"></td> <td style="width:154px;text-align: left;border-right-style: hidden;border-bottom-style: hidden;"><img src="images/{{Course.ProfilePicPath || university/No_Image.png}}" id="logo" style="width: 40%;"></td>
<td style="width: 150px;border-bottom-style: hidden;" colspan="2"> <td style="border-bottom-style: hidden;" colspan="2">
<h3 style="color:blue; margin-left: -150px;"><strong>{{Course.UniversityName}}</strong></h3> <h3 style="color:blue; text-align:center;margin-left:-20%;"><strong>{{Course.UniversityName}}</strong></h3>
<p style="color:blue; margin-left: -96px; margin-top: -9px;">{{Course.Address}}</p> <p style="color:blue; margin-top: 2px;text-align:center;margin-left:-30%;">{{Course.Address}}</p>
</td> </td>
</tr> </tr>
<tr> <tr>