diff --git a/Apollo/api/application/models/Hallticket_model.php b/Apollo/api/application/models/Hallticket_model.php
index fa35a558..5946a068 100755
--- a/Apollo/api/application/models/Hallticket_model.php
+++ b/Apollo/api/application/models/Hallticket_model.php
@@ -169,13 +169,15 @@ class Hallticket_model extends CI_Model
* */
public function getCourseDetails($universityID=null,$branchId)
{
- $this->db->select('CourseID,CONCAT(CourseName, "(",CourseCode,")") AS CourseName');
+
+ $this->db->select('T_CourseMaster.CourseID,CONCAT(T_CourseMaster.CourseName, "(",T_CourseMaster.CourseCode,")") AS CourseName,T_Course_Fees_Details.ProgramType,T_Course_Fees_Details.FeesType,T_Course_Fees_Details.Sem_Year');
+ $this->db->join('T_Course_Fees_Details','T_CourseMaster.CourseID = T_Course_Fees_Details.CourseID');
$this->db->where('UniversityID',$universityID);
$this->db->where('BranchCode',$branchId);
$this->db->where('IsActive','1');
$this->db->group_by('CourseName');
$this->db->order_by('CourseID','ASC');
- $courseDetails = $this->db->get(COURSE);
+ $courseDetails = $this->db->get('T_CourseMaster');
return $courseDetails->result();
}
@@ -224,6 +226,15 @@ class Hallticket_model extends CI_Model
* */
public function saveAllSemesterSubjectMappingmodel($UID,$courseIDS,$requestedBy,$branchId,$semArray)
{
+
+ // echo "from MODEL";
+ // print_r($courseIDS);die();
+
+ $tempCourseArray = array();
+ foreach($courseIDS as $c)
+ {
+ $tempCourseArray[] = $c['CourseID'];
+ }
$sem1 = 0;$sem2=0;$sem3=0;$sem4=0;$sem5=0;$sem6=0;$sem7=0;$sem8 = 0;
foreach($semArray as $key => $s)
{
@@ -262,7 +273,7 @@ class Hallticket_model extends CI_Model
$this->db->from('T_SemSubMap_Master');
$this->db->where('BranchCode',$branchId);
$this->db->where('UniversityID',$UID);
- $this->db->where_in('CourseID',$courseIDS);
+ $this->db->where_in('CourseID',$tempCourseArray);
$isExist = $this->db->get();
$isExist = $isExist->result();
$result_array = array('insert'=>'','exist'=>'');
@@ -274,7 +285,7 @@ class Hallticket_model extends CI_Model
$ids = array();
- foreach($courseIDS as $course)
+ foreach($tempCourseArray as $course)
{
for($i=1;$i<=8;$i++)
{
@@ -431,10 +442,11 @@ class Hallticket_model extends CI_Model
* */
public function getAllSemesterSubjectsmodel($branchId)
{
- $this->db->select('T_SemSubMap_Master.UniversityID,T_UniversityMaster.UniversityName,T_CourseMaster.CourseID,T_CourseMaster.CourseCode,T_CourseMaster.CourseName');
+ $this->db->select('T_SemSubMap_Master.UniversityID,T_UniversityMaster.UniversityName,T_CourseMaster.CourseID,T_CourseMaster.CourseCode,T_CourseMaster.CourseName,T_Course_Fees_Details.ProgramType,T_Course_Fees_Details.FeesType,T_Course_Fees_Details.Sem_Year');
$this->db->from('T_SemSubMap_Master');
$this->db->join('T_UniversityMaster','T_SemSubMap_Master.UniversityID=T_UniversityMaster.UniversityID and T_SemSubMap_Master.BranchCode=T_UniversityMaster.BranchCode') ;
$this->db->join('T_CourseMaster','T_SemSubMap_Master.CourseID=T_CourseMaster.CourseID and T_SemSubMap_Master.BranchCode=T_CourseMaster.BranchCode');
+ $this->db->join('T_Course_Fees_Details','T_SemSubMap_Master.CourseID=T_Course_Fees_Details.CourseID and T_CourseMaster.CourseID=T_Course_Fees_Details.CourseID');
$this->db->group_by('T_SemSubMap_Master.UniversityID,T_SemSubMap_Master.CourseID');
$res = $this->db->get();
return $res->result();
@@ -479,6 +491,8 @@ class Hallticket_model extends CI_Model
* */
public function updateAllSemesterSubjectMappingmodel($UID,$courseIDS,$requestedBy,$branchId,$semArray)
{
+
+ //echo $courseIDS;die();
$sem1 = 0;$sem2=0;$sem3=0;$sem4=0;$sem5=0;$sem6=0;$sem7=0;$sem8 = 0;
foreach($semArray as $key => $s)
{
diff --git a/Apollo/assets/js/controllers/generateHallTicketCtrl.js b/Apollo/assets/js/controllers/generateHallTicketCtrl.js
index 46fd69e6..1e94f655 100755
--- a/Apollo/assets/js/controllers/generateHallTicketCtrl.js
+++ b/Apollo/assets/js/controllers/generateHallTicketCtrl.js
@@ -583,7 +583,7 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
var sem1 = "";
- var sem2 = "";
+ // var sem2 = "";
var tableid = value.StudentID;
@@ -595,33 +595,33 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
});
var firstTableID = "0";
- var SecTableID = "1";
+ //var SecTableID = "1";
switch(i)
{
case 0:
var firstTableID = tableid+'year10';
- var SecTableID = tableid+'year11';
+ //var SecTableID = tableid+'year11';
semName = 'YEAR1';
break;
case 1:
var firstTableID = tableid+'year20';
- var SecTableID = tableid+'year21';
+ //var SecTableID = tableid+'year21';
semName = 'YEAR2';
break;
case 2:
var firstTableID = tableid+'year30';
- var SecTableID = tableid+'year31';
+ //var SecTableID = tableid+'year31';
semName = 'YEAR3';
break;
case 4:
var firstTableID = tableid+'year40';
- var SecTableID = tableid+'year41';
+ //var SecTableID = tableid+'year41';
semName = 'YEAR4';
break;
@@ -637,17 +637,14 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
}
- if(document.getElementById(SecTableID))
- {
+ // if(document.getElementById(SecTableID))
+ // {
- var sem2 = doc.autoTableHtmlToJson(document.getElementById(SecTableID));
+ // var sem2 = doc.autoTableHtmlToJson(document.getElementById(SecTableID));
- }
+ // }
- if(sem1 != "")
- {
- doc.autoTable(sem1.columns, sem1.data, {margin: {top: 170},theme:'grid'});
- }
+
@@ -711,22 +708,27 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
addPageContent: header,
margin: {
- top: 100
+ top: 170
},
- startY: doc.autoTableEndPosY() + 20,
+ //startY: doc.autoTableEndPosY() + 20,
theme :'grid'
};
-
-
- if(sem2 != "")
+
+
+ if(sem1 != "")
{
- doc.autoTable(sem2.columns, sem2.data, options);
+ doc.autoTable(sem1.columns, sem1.data, options);
+ }
+
+ // if(sem2 != "")
+ // {
+ // doc.autoTable(sem2.columns, sem2.data, options);
- }
+ // }
- if(sem2 != "" || sem1 != "")
+ if(sem1 != "")
{
doc.save(fileName);
}
diff --git a/Apollo/assets/js/controllers/semcoursemapCtrl.js b/Apollo/assets/js/controllers/semcoursemapCtrl.js
index 58a6001f..e8fd023b 100755
--- a/Apollo/assets/js/controllers/semcoursemapCtrl.js
+++ b/Apollo/assets/js/controllers/semcoursemapCtrl.js
@@ -30,6 +30,16 @@ app.controller('semcoursemapCtrl', ["$scope","$rootScope","toaster", "$filter",
$scope.semDetailsLoadingStatus = false;
$scope.semDetailsLoadingTxt = "";
+ $scope.label1 = "";
+ $scope.label2 = "";
+ $scope.label3 = "";
+ $scope.label4 = "";
+
+ $scope.viewLabel1 = "";//FOr View Page
+ $scope.viewLlabel2 = "";//FOr View Page
+ $scope.viewLlabel3 = "";//FOr View Page
+ $scope.viewLlabel4 = "";//FOr View Page
+
$scope.selectedCourseName = [];
$scope.selectedUniversityCourseName = '';
@@ -125,6 +135,7 @@ app.controller('semcoursemapCtrl', ["$scope","$rootScope","toaster", "$filter",
$scope.testFun = function(){
$scope.selectedUniversityCourseName = $scope.myModel.universityName.courseDetails;
+ //console.log($scope.selectedUniversityCourseName);
if($scope.selectedUniversityCourseName.length == 0){ swal('No Courses Available','','info'); }
$scope.selectedCourseNameC = {
list: $scope.selectedCourseName,
@@ -158,7 +169,8 @@ app.controller('semcoursemapCtrl', ["$scope","$rootScope","toaster", "$filter",
}
else
{
- //console.log(UID+'-'+COURSES.list);
+ //alert($scope.prevoiusSelectedCouseType);
+
if(UID == undefined || UID == '')
{
@@ -170,8 +182,24 @@ app.controller('semcoursemapCtrl', ["$scope","$rootScope","toaster", "$filter",
swal("Select Course");
return false;
}
- //console.log(JSON.parse(localStorage.getItem('localObj')));
- //return false;
+
+ if($scope.prevoiusSelectedCouseType.toUpperCase() == 'EAR')
+ {
+
+ $scope.label1 = "Year 1";
+ $scope.label2 = "Year 2";
+ $scope.label3 = "Year 3";
+ $scope.label4 = "Year 4";
+ $scope.courseMode = 1;
+ }
+ else
+ {
+ $scope.label1 = "Semester 1";
+ $scope.label2 = "Semester 3";
+ $scope.label3 = "Semester 5";
+ $scope.label4 = "Semester 7";
+ $scope.courseMode = 0;
+ }
$scope.semDropDownShowLoading = false;
$scope.semDropDownShow = false;
$scope.semDropDownShowLoading = true;
@@ -285,6 +313,8 @@ app.controller('semcoursemapCtrl', ["$scope","$rootScope","toaster", "$filter",
$scope.saveAll = function()
{
//swal('SAVEALL',$scope.myModel.universityName.universityID,'warning');
+
+
var universityID = $scope.myModel.universityName.universityID;
var courseIDs = $scope.selectedCourseNameC.list;
var sem1 = $scope.selectedSubjetcsSem1C.list;
@@ -296,16 +326,7 @@ app.controller('semcoursemapCtrl', ["$scope","$rootScope","toaster", "$filter",
var sem7 = $scope.selectedSubjetcsSem7C.list;
var sem8 = $scope.selectedSubjetcsSem8C.list;
- // console.log(universityID+'-'+courseIDs);
- // console.log(courseIDs);
- // console.log(sem1);
- // console.log(sem2);
- // console.log(sem3);
- // console.log(sem4);
- // console.log(sem5);
- // console.log(sem6);
- // console.log(sem7);
- // console.log(sem8);
+
var semestersArray = [];
for(var i = 1; i<= 8 ;i++)
{
@@ -428,9 +449,35 @@ app.controller('semcoursemapCtrl', ["$scope","$rootScope","toaster", "$filter",
}
- $scope.setEditId = function (uid,cid)
+ $scope.setEditId = function (uid,cid,PT,FT,SY)
{
- //alert(uid+'-'+cid);
+ //alert(uid+'-'+cid+'-'+PT+'-'+FT+'-'+SY);
+
+ var courseModewithoutnum = "";
+ if(PT == 'Y001' && FT == 'F002')
+ {
+ var courseMode = (SY.toUpperCase()).substr(-4);
+ courseModewithoutnum = courseMode.substr(0,3);
+ //alert(courseModewithoutnum);
+ if((courseModewithoutnum.toUpperCase()) == 'EAR')
+ {
+ $scope.viewLabel1 = 'Year 1';
+ $scope.viewLabel2 = 'Year 2';
+ $scope.viewLabel3 = 'Year 3';
+ $scope.viewLabel4 = 'Year 4';
+ $scope.viewPageCourseMode = 1;
+ }
+ else
+ {
+ $scope.viewLabel1 = 'Semester 1';
+ $scope.viewLabel2 = 'Semester 3';
+ $scope.viewLabel3 = 'Semester 5';
+ $scope.viewLabel4 = 'Semester 7';
+ $scope.viewPageCourseMode = 0;
+
+ }
+ }
+
$scope.editUniversityId = uid;
$scope.editCourseId = cid;
$scope.getIndividualCourseSemMappingDetails(uid,cid);
@@ -583,10 +630,10 @@ app.controller('semcoursemapCtrl', ["$scope","$rootScope","toaster", "$filter",
}
};
$http(updateAllInfo).then(function(response) {
-
+ console.log(response);
if(response.data.status == 200 && response.data.txtStatus)
{
- //console.log(response);
+
$scope.updateButtonTxt = "SAVED";
swal('Saved!','Good Job','success')
$state.go($state.current, {}, {reload: true});
@@ -599,5 +646,34 @@ app.controller('semcoursemapCtrl', ["$scope","$rootScope","toaster", "$filter",
}
+
+ $scope.prevoiusSelectedCouseType = "";
+ $scope.checkCourseMode = function(item)
+ {
+
+
+ if(item['ProgramType'] == "Y001" && item['FeesType'] == "F002")
+ {
+
+ var tempString = item['Sem_Year'];
+ var courseMode = (tempString.toUpperCase()).substr(-4);
+ var courseModewithoutnum = courseMode.substr(0,3);
+
+
+ if($scope.prevoiusSelectedCouseType != "" && $scope.prevoiusSelectedCouseType != courseModewithoutnum)
+ {
+ swal('Semester and Year Mode Combination Not Accepted','Please Select Either Year Mode OR Semester Mode Courses','info');
+ $scope.selectedCourseNameC.list = "";
+ $scope.prevoiusSelectedCouseType = "";
+ $scope.semDropDownShow = false;
+ return false;
+ }
+ $scope.prevoiusSelectedCouseType = courseModewithoutnum;
+
+
+ }
+
+
+ }
}]);
diff --git a/Apollo/assets/views/hallticket/semcoursemap.html b/Apollo/assets/views/hallticket/semcoursemap.html
index 3278290d..5a865799 100755
--- a/Apollo/assets/views/hallticket/semcoursemap.html
+++ b/Apollo/assets/views/hallticket/semcoursemap.html
@@ -84,7 +84,7 @@
| {{p.CourseName}}({{p.CourseCode}}) |
+ ng-click="setEditId(p.UniversityID,p.CourseID,p.ProgramType,p.FeesType,p.Sem_Year);">
|
@@ -104,12 +104,12 @@
-
+
@@ -125,7 +125,7 @@
-