sem/year display in view page issue no : 1639
This commit is contained in:
venbatechnologies@gmail.com
parent
adb7a1160b
commit
077b6b979d
@ -115,7 +115,7 @@ class Hallticket_model extends CI_Model
|
||||
public function get_unShedules($mapid,$subid,$branchcode,$CourseID,$universityID)
|
||||
{
|
||||
//echo $mapid;
|
||||
$sql="SELECT semchild.SubjectID,semchild.MapID,bsc.ScheduleDate,bsc.FromTime,bsc.ToTime,sm.SubjectName
|
||||
$sql="SELECT semchild.SubjectID,semchild.MapID,bsc.ScheduleDate,bsc.FromTime,bsc.ToTime,sm.SubjectName,SemesterID,SemesterID
|
||||
FROM T_SemSubMap_Child semchild
|
||||
LEFT JOIN T_SemSubMap_Master semmaster ON semmaster.MapID = semchild.MapID
|
||||
LEFT JOIN T_Batch_Schedule_Master bsm ON bsm.UniversityID = semmaster.UniversityID
|
||||
@ -125,14 +125,16 @@ class Hallticket_model extends CI_Model
|
||||
WHERE semchild.isActive = '1' and bsm.SchId='".$mapid."'
|
||||
group by semchild.SubjectID,semchild.MapID";
|
||||
$b=$this->db->query($sql);
|
||||
//print_r($b);
|
||||
// print_r($b->result());die();
|
||||
|
||||
//print_r($this->db->last_query());die();
|
||||
if($b->result()){
|
||||
$resultShedule['status']=true;
|
||||
$mastScheduleID="";
|
||||
foreach($b->result() as $row)
|
||||
{
|
||||
|
||||
$this->db->select('T_Batch_Schedule_Child.SchId,T_Batch_Schedule_Child.SubjectID,T_Batch_Schedule_Child.ScheduleDate,T_Batch_Schedule_Child.FromTime,T_Batch_Schedule_Child.ToTime,T_Batch_Schedule_Child.SchChildId,T_Batch_Schedule_Child.SchId');
|
||||
$this->db->select('T_Batch_Schedule_Child.SchId,T_Batch_Schedule_Child.SubjectID,T_Batch_Schedule_Child.ScheduleDate,T_Batch_Schedule_Child.FromTime,T_Batch_Schedule_Child.ToTime,T_Batch_Schedule_Child.SchChildId,T_Batch_Schedule_Child.SchId,SCM.SEM_Year as Sem_year');
|
||||
$this->db->from('T_Batch_Schedule_Master SCM');
|
||||
$this->db->join('T_Batch_Schedule_Child','T_Batch_Schedule_Child.SchId = SCM.SchId');
|
||||
$this->db->where('SCM.BranchCode',$branchcode);
|
||||
@ -140,7 +142,7 @@ group by semchild.SubjectID,semchild.MapID";
|
||||
// $this->db->where('T_Batch_Schedule_Child.SchId',$mapid);
|
||||
$this->db->where('T_Batch_Schedule_Child.SubjectID',$row->SubjectID);
|
||||
$existsheduledetails = $this->db->get();
|
||||
//print_r($existsheduledetails);
|
||||
//print_r($existsheduledetails->result);die();
|
||||
if($existData=$existsheduledetails->result())
|
||||
{
|
||||
|
||||
@ -152,6 +154,7 @@ group by semchild.SubjectID,semchild.MapID";
|
||||
$fetchData['ToTime']=$existData[0]->ToTime;
|
||||
$fetchData['SchChildId']=$existData[0]->SchChildId;
|
||||
$fetchData['SchId']=$existData[0]->SchId;
|
||||
$fetchData['Sem_year'] = $existData[0]->Sem_year;
|
||||
$mastScheduleID=$existData[0]->SchId;
|
||||
|
||||
}
|
||||
@ -166,6 +169,7 @@ group by semchild.SubjectID,semchild.MapID";
|
||||
$fetchData['ToTime']="";
|
||||
$fetchData['SchChildId']="";
|
||||
$fetchData['SchId']= $mastScheduleID;
|
||||
$fetchData['Sem_year'] = "";
|
||||
|
||||
}
|
||||
$fetchshedule[]=$fetchData;
|
||||
|
||||
@ -11,25 +11,30 @@
|
||||
<div class="panel-heading border-light">
|
||||
<!--<h4 class="panel-title text-pink">Schedule Details</h4>
|
||||
<paneltool class="panel-tools" tool-collapse="tool-collapse" tool-refresh="load1" tool-dismiss="tool-dismiss"></paneltool>-->
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-2">
|
||||
<h4 class="panel-title text-green">Subject</h4>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-2">
|
||||
<h4 class="panel-title text-green">Sem/Year</h4>
|
||||
</div>
|
||||
<div class="col-md-2">
|
||||
<h4 class="panel-title text-green">Date</h4>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-2">
|
||||
<h4 class="panel-title text-green">Start Time</h4>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-2">
|
||||
<h4 class="panel-title text-green">End Time</h4>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
<div collapse="panel2" ng-init="panel2=false" class="panel-wrapper">
|
||||
<div class="panel-body panel-scroll height-250" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
|
||||
<div collapse="panel2" ng-init="panel2=false" class="panel-wrapper">
|
||||
<div class="panel-body panel-scroll height-250" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
|
||||
<!--<pre>{{unsheduledetails | json}}</pre>-->
|
||||
<div class="row" ng-repeat="s in unsheduledetails" style="margin-top:30px;">
|
||||
<div class="row" ng-repeat="s in unsheduledetails" style="margin-top:30px;">
|
||||
|
||||
<div class="col-md-3 form-group"
|
||||
<div class="col-md-2 form-group"
|
||||
ng-class="{'has-error':Form.SubjectName.$dirty && Form.SubjectName.$invalid, 'has-success':Form.batchcode.$valid}">
|
||||
<!--<label>
|
||||
Subject Name <span class="symbol required"></span>
|
||||
@ -39,17 +44,27 @@
|
||||
tabindex="1" class="form-control" name="SubjectName"
|
||||
ng-model="s.SubjectName" readonly/>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div >
|
||||
|
||||
<div class="col-md-2">
|
||||
|
||||
<input type="text"
|
||||
tabindex="5" class="form-control" name="Sem_Year"
|
||||
ng-model="s.Sem_year" readonly/>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div data-ng-controller="DatepickerDemoCtrl">
|
||||
<div class="col-md-3 form-group"
|
||||
<div data-ng-controller="DatepickerDemoCtrl">
|
||||
<div class="col-md-2 form-group"
|
||||
ng-class="{'has-error':Form.date.$dirty && Form.date.$invalid, 'has-success':Form.date.$valid}">
|
||||
<!--<label>
|
||||
Shedule Date <span
|
||||
class="symbol required"></span>
|
||||
</label>-->
|
||||
<input type="text"
|
||||
tabindex="1"
|
||||
<input type="text" tabindex="1"
|
||||
class="form-control "
|
||||
ng-click="startOpen = !startOpen"
|
||||
datepicker-popup="dd-MM-yyyy"
|
||||
@ -64,13 +79,13 @@
|
||||
ng-if="Form.date.$dirty && Form.date.$error.required">Shedule Date is required.</span>
|
||||
<!--<span class="success text-small block"-->
|
||||
<!--ng-if="Form.date.$valid ">Thank You</span>-->
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-md-3 form-group" style="margin-top: -34px;"
|
||||
<div class="col-md-2 form-group" style="margin-top: -34px;"
|
||||
ng-class="{'has-error':Form.FromTime.$dirty && Form.FromTime.$invalid, 'has-success':Form.batchcode.$valid}">
|
||||
<!--<label>
|
||||
Shedule Starting Time <span class="symbol required"></span>
|
||||
@ -92,11 +107,9 @@
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
<div style="margin-top: -34px;"
|
||||
</div>
|
||||
|
||||
<div style="margin-top: -34px;"
|
||||
ng-class="{'has-error':Form.ToTime.$dirty && Form.ToTime.$invalid, 'has-success':Form.batchcode.$valid}">
|
||||
<!--<label>
|
||||
Shedule Ending Time <span class="symbol required"></span>
|
||||
@ -118,17 +131,13 @@
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
|
||||
Loading…
Reference in New Issue
Block a user