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

Yesterday report issues : ps

Browse Source
This commit is contained in:
Sanjeev 2020-12-17 11:11:46 +05:30
parent 973c3cb230
commit bc58489d76
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Apollo/api/application/models/Reports_model.php
View File

@ -1022,6 +1022,7 @@ LEFT JOIN BalFees AS BALFEE ON BALFEE.student = sfs.StudentID AND BALFEE.feestyp
BillAmount AS BillAmount BillAmount AS BillAmount
FROM FROM
T_Students_Fees_PaidDetails T_Students_Fees_PaidDetails
WHERE IsActive = '1'
GROUP BY FeesId) AS sfpd ON sfpd.FeeID = sfs.FeesID GROUP BY FeesId) AS sfpd ON sfpd.FeeID = sfs.FeesID
WHERE WHERE
STU.IsActive = '1' STU.IsActive = '1'

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

@ -1111,12 +1111,12 @@ $this->db->insert_batch('T_BroadcastStatus', $data);
$courseId = $reqData['courseId']; $courseId = $reqData['courseId'];
// echo $studentId;exit(); // echo $studentId;exit();
// $searchTableFor = APPLICATION_FORM; // $searchTableFor = APPLICATION_FORM;
$this->db->select('t1.ID, t2.BatchCode, t2.FeeType as SemID, CFD.Sem_Year as Sem_Year, t2.RegistrationMode, t2.RegistrationType, t1.AppFormDate as StatusUpdateDate,t3.ListName ,t1.Comments'); $this->db->select('t1.ID, t2.BatchCode, t2.FeeType as SemID, CFD.Sem_Year as Sem_Year, t2.RegistrationMode, t2.RegistrationType, t1.AppFormDate as StatusUpdateDate,if(t3.ListCode = "U001","-",t3.ListName) as ListName ,t1.Comments');
$this->db->from('T_ApplicationFormStatus as t1'); $this->db->from('T_ApplicationFormStatus as t1');
$this->db->join('T_Registration_Details as t2', 't2.ID = t1.Registration_Details_ID'); $this->db->join('T_Registration_Details as t2', 't2.ID = t1.Registration_Details_ID');
$this->db->join('T_Course_Fees_Details as CFD', 'CFD.ID = t2.FeeType'); $this->db->join('T_Course_Fees_Details as CFD', 'CFD.ID = t2.FeeType');
$this->db->join('' . PICK_LIST_DETAILS . ' as t3', 't3.ListCode = t1.ListCode', 'LEFT'); $this->db->join('' . PICK_LIST_DETAILS . ' as t3', 't3.ListCode = t1.ListCode', 'LEFT');
$this->db->join('T_Students_Fees_Status as SFS','SFS.FeesID = t2.Student_Fee_Status_Id');
$this->db->where('t2.StudentID', $studentId); $this->db->where('t2.StudentID', $studentId);
$this->db->where('t2.CourseID', $courseId); $this->db->where('t2.CourseID', $courseId);
$this->db->group_by('t1.ID'); $this->db->group_by('t1.ID');

2
Apollo/assets/views/report_certificate_status.html
View File

@ -185,7 +185,7 @@ td,th {
<td style="text-align:right;">{{p.balance || "0"}}</td> <td style="text-align:right;">{{p.balance || "0"}}</td>
<td>{{p.lcode === "U001" ? "-" : p.STATUS}}</td> <td>{{p.lcode === "U001" ? "-" : p.STATUS}}</td>
<td>{{p.certname}}</td> <td>{{p.certname}}</td>
<td>{{p.Courier_Details}}</td> <td class="with-newlines">{{p.Courier_Details}}</td>
<td style="max-width: 120px;white-space: pre-wrap; word-wrap: break-word !important;">{{p.acmts}}</td> <td style="max-width: 120px;white-space: pre-wrap; word-wrap: break-word !important;">{{p.acmts}}</td>
<td>{{p.adate | date :'dd-MM-yyyy'}}</td> <td>{{p.adate | date :'dd-MM-yyyy'}}</td>
</tr> </tr>

6
Apollo/assets/views/stafflead.html
View File

@ -84,7 +84,9 @@
</tr> </tr>
</thead> </thead>
<tbody dir-paginate="p in SatffCountDetails|filter:search:strict">
<!-- <tbody dir-paginate="p in SatffCountDetails|filter:search:strict|itemsPerPage:10"> -->
<tbody dir-paginate="p in SatffCountDetails|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10">
<tr > <tr >
<td>{{p.SL_NO}}</td> <td>{{p.SL_NO}}</td>
@ -105,7 +107,7 @@
</table> </table>
<dir-pagination-controls direction-links="true" boundary-links="true"> <dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
</dir-pagination-controls> </dir-pagination-controls>
</div> </div>