From 245e3bdf5d1fe949ccef2e2e80b4fcfd235a2bd1 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Tue, 28 Aug 2018 10:28:18 +0530
Subject: [PATCH 1/3] sem course map

---
 Apollo/assets/js/controllers/semcoursemapCtrl.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Apollo/assets/js/controllers/semcoursemapCtrl.js b/Apollo/assets/js/controllers/semcoursemapCtrl.js
index fe6e136a..642ad250 100755
--- a/Apollo/assets/js/controllers/semcoursemapCtrl.js
+++ b/Apollo/assets/js/controllers/semcoursemapCtrl.js
@@ -742,14 +742,14 @@ var firstError = null;
  
 else{
 
-//  console.log(myModel.Year);
-// return false;
+ //console.log(myModel.Year);
+ //return false;
 
-if(myModel.Year == undefined || myModel.Year =='')
-{
-   swal("Please Enter all the values","","error"); 
-   return false;
-}
+// if((myModel.Year == undefined || myModel.Year =='') && ($scope.Semval== undefined || $scope.Semval =='') )
+// {
+//    swal("Please Enter all the values","","error"); 
+//    return false;
+// }
 
 
 if($scope.courseMode==1)

From afbf5644983692603e1039edbb5724585f6e8555 Mon Sep 17 00:00:00 2001
From: sriramv <sriram.v@venbainfotech.com>
Date: Tue, 28 Aug 2018 12:01:50 +0530
Subject: [PATCH 2/3] Reregister issues fixed by sriram

---
 Apollo/assets/views/status-update/setFeesForStudent.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Apollo/assets/views/status-update/setFeesForStudent.html b/Apollo/assets/views/status-update/setFeesForStudent.html
index 2e4562f4..51727068 100755
--- a/Apollo/assets/views/status-update/setFeesForStudent.html
+++ b/Apollo/assets/views/status-update/setFeesForStudent.html
@@ -413,7 +413,7 @@
                                         </a>
                                         </td>
                                         <td>
-                                            <a ng-if="((p.Sem_Year | uppercase) !='SEM1'  && (p.Sem_Year | uppercase) !='YEAR1')  && feesStructureInfo[0].ProgramType=='Y001'" class="text-red"  tooltip="Generate Re-registration PDF" ng-click="reregisterPDF(p);"><b class="fa fa-hover fa fa-file-pdf-o " aria-hidden="true"></b>
+                                            <a ng-if="((p.Sem_Year | uppercase) !='SEM1'  && (p.Sem_Year | uppercase) !='YEAR1')  && p.ProgramType=='Y001'" class="text-red"  tooltip="Generate Re-registration PDF" ng-click="reregisterPDF(p);"><b class="fa fa-hover fa fa-file-pdf-o " aria-hidden="true"></b>
                                             </a></td>
 
                                     </tr>

From 54dcc828c4972f321e0a429bb6dd2a7cf8916207 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Tue, 28 Aug 2018 12:49:58 +0530
Subject: [PATCH 3/3] screen name change

---
 Apollo/assets/views/hallticket/semcoursemap.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Apollo/assets/views/hallticket/semcoursemap.html b/Apollo/assets/views/hallticket/semcoursemap.html
index 3defc8b1..e8936189 100755
--- a/Apollo/assets/views/hallticket/semcoursemap.html
+++ b/Apollo/assets/views/hallticket/semcoursemap.html
@@ -25,9 +25,9 @@
     <div class="row">
         <div class="col-sm-8">
 
-            <h1 class="mainTitle" translate="Course Semester Mapping">{{ mainTitle }}</h1>
+            <h1 class="mainTitle" translate="Course Subject Mapping">{{ mainTitle }}</h1>
 
-            <span class="mainDescription">Allocate Courses to Corresponding Semesters </span>
+            <span class="mainDescription">Allocate Courses to Corresponding Subjects </span>
 
         </div>
         <div ncy-breadcrumb></div>