From 162858f7dbf2f88181d5682c7eb0b7e423f80ec1 Mon Sep 17 00:00:00 2001
From: gayathri1990 <maran7mca@gmail.com>
Date: Fri, 17 Aug 2018 17:59:51 +0530
Subject: [PATCH 1/2] coursemap subject code

---
 .../assets/views/hallticket/semcoursemap.html | 64 +++++++++----------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/Apollo/assets/views/hallticket/semcoursemap.html b/Apollo/assets/views/hallticket/semcoursemap.html
index 569963b2..aad606fb 100755
--- a/Apollo/assets/views/hallticket/semcoursemap.html
+++ b/Apollo/assets/views/hallticket/semcoursemap.html
@@ -114,11 +114,11 @@
 												<ui-select multiple ng-model="selectedSubjetcsSem1ViewPage.list" tabindex="4" id="sem1" ng-change="modifySelectedSubjetcs(selectedSubjetcsSem1ViewPage.list);" on-remove="itemRemove($item);">
 												
 																<ui-select-match placeholder="Select Subjetcs" >
-																	{{$item.SubjectName}} 
+																{{$item.SubjectCode}}-{{$item.SubjectName}} 
 																</ui-select-match>
 																<ui-select-choices
 																		repeat="x in overAllSubjects | filter:$select.search">
-																	{{x.SubjectName}}
+																	{{x.SubjectCode}}-{{x.SubjectName}}
 																</ui-select-choices>
 															</ui-select>
 													 
@@ -132,11 +132,11 @@
 												<ui-select multiple ng-model="selectedSubjetcsSem2ViewPage.list"  tabindex="5" ng-change="modifySelectedSubjetcs(selectedSubjetcsSem2ViewPage.list);" on-remove="itemRemove($item);">
 												
 																<ui-select-match placeholder="Select Subjetcs" >
-																	{{$item.SubjectName}} 
+																	{{$item.SubjectCode}}-{{$item.SubjectName}} 
 																</ui-select-match>
 																<ui-select-choices
 																		repeat="x in overAllSubjects | filter:$select.search">
-																	{{x.SubjectName}}
+																	{{x.SubjectCode}}-{{x.SubjectName}}
 																</ui-select-choices>
 															</ui-select>
 													 <!-- <pre>{{selectedSubjetcsSem2C.list | json}}</pre>  -->
@@ -156,11 +156,11 @@
 												<ui-select multiple ng-model="selectedSubjetcsSem3ViewPage.list" tabindex="6" ng-change="modifySelectedSubjetcs(selectedSubjetcsSem3ViewPage.list);" on-remove="itemRemove($item);">
 												
 																<ui-select-match placeholder="Select Subjetcs" >
-																	{{$item.SubjectName}} 
+																	{{$item.SubjectCode}}-{{$item.SubjectName}} 
 																</ui-select-match>
 																<ui-select-choices
 																		repeat="x in overAllSubjects | filter:$select.search">
-																	{{x.SubjectName}}
+																	{{x.SubjectCode}}-{{x.SubjectName}}
 																</ui-select-choices>
 															</ui-select>
 													 <!-- <pre>{{selectedSubjetcsSem3C.list | json}}</pre>  -->
@@ -179,11 +179,11 @@
 												<ui-select multiple ng-model="selectedSubjetcsSem4ViewPage.list" tabindex="7" ng-change="modifySelectedSubjetcs(selectedSubjetcsSem4ViewPage.list);" on-remove="itemRemove($item);">
 												
 																<ui-select-match placeholder="Select Subjetcs" >
-																	{{$item.SubjectName}} 
+																	{{$item.SubjectCode}}-{{$item.SubjectName}} 
 																</ui-select-match>
 																<ui-select-choices
 																		repeat="x in overAllSubjects | filter:$select.search">
-																	{{x.SubjectName}}
+																	{{x.SubjectCode}}-{{x.SubjectName}}
 																</ui-select-choices>
 															</ui-select>
 													 <!-- <pre>{{selectedSubjetcsSem4C.list | json}}</pre>  -->
@@ -203,11 +203,11 @@
 												<ui-select multiple ng-model="selectedSubjetcsSem5ViewPage.list" tabindex="8" ng-change="modifySelectedSubjetcs(selectedSubjetcsSem5ViewPage.list);" on-remove="itemRemove($item);">
 												
 																<ui-select-match placeholder="Select Subjetcs" >
-																	{{$item.SubjectName}} 
+																	{{$item.SubjectCode}}-{{$item.SubjectName}} 
 																</ui-select-match>
 																<ui-select-choices
 																		repeat="x in overAllSubjects | filter:$select.search">
-																	{{x.SubjectName}}
+																	{{x.SubjectCode}}-{{x.SubjectName}}
 																</ui-select-choices>
 															</ui-select>
 													 <!-- <pre>{{selectedSubjetcsSem5C.list | json}}</pre>  -->
@@ -221,11 +221,11 @@
 												<ui-select multiple ng-model="selectedSubjetcsSem6ViewPage.list" tabindex="9" ng-change="modifySelectedSubjetcs(selectedSubjetcsSem6ViewPage.list);" on-remove="itemRemove($item);">
 												
 																<ui-select-match placeholder="Select Subjetcs" >
-																	{{$item.SubjectName}} 
+																	{{$item.SubjectCode}}-{{$item.SubjectName}} 
 																</ui-select-match>
 																<ui-select-choices
 																		repeat="x in overAllSubjects | filter:$select.search">
-																	{{x.SubjectName}}
+																	{{x.SubjectCode}}-{{x.SubjectName}}
 																</ui-select-choices>
 															</ui-select>
 													 <!-- <pre>{{selectedSubjetcsSem6C.list | json}}</pre>  -->
@@ -245,11 +245,11 @@
 												<ui-select multiple ng-model="selectedSubjetcsSem7ViewPage.list" tabindex="10" ng-change="modifySelectedSubjetcs(selectedSubjetcsSem7ViewPage.list);" on-remove="itemRemove($item);">
 												
 																<ui-select-match placeholder="Select Subjetcs" >
-																	{{$item.SubjectName}} 
+																	{{$item.SubjectCode}}-{{$item.SubjectName}} 
 																</ui-select-match>
 																<ui-select-choices
 																		repeat="x in overAllSubjects | filter:$select.search">
-																	{{x.SubjectName}}
+																	{{x.SubjectCode}}-{{x.SubjectName}}
 																</ui-select-choices>
 															</ui-select>
 													  <!-- <pre>{{viewPage.SubjectDetails[7] | json}}</pre>  -->
@@ -263,11 +263,11 @@
 												<ui-select multiple ng-model="selectedSubjetcsSem8ViewPage.list" tabindex="11" ng-change="modifySelectedSubjetcs(selectedSubjetcsSem8ViewPage.list);" on-remove="itemRemove($item);">
 												
 																<ui-select-match placeholder="Select Subjetcs" >
-																	{{$item.SubjectName}} 
+																	{{$item.SubjectCode}}-{{$item.SubjectName}} 
 																</ui-select-match>
 																<ui-select-choices
 																		repeat="x in overAllSubjects | filter:$select.search">
-																	{{x.SubjectName}}
+																	{{x.SubjectCode}}-{{x.SubjectName}}
 																</ui-select-choices>
 															</ui-select>
 													 <!-- <pre>{{selectedSubjetcsSem8C.list | json}}</pre>  -->
@@ -367,11 +367,11 @@
 						<ui-select multiple ng-model="selectedSubjetcsSem1C.list" tabindex="4" id="sem1" ng-change="removeSelectedSubjetcs(selectedSubjetcsSem1C.list);">
 						
                                         <ui-select-match placeholder="Select Subjetcs" >
-                                            {{$item.SubjectName}} 
+                                          {{$item.SubjectCode}}-{{$item.SubjectName}}  
                                         </ui-select-match>
                                         <ui-select-choices
                                                 repeat="x in subjects | filter:$select.search">
-                                            {{x.SubjectName}}
+                                             {{x.SubjectCode}}-{{x.SubjectName}}
                                         </ui-select-choices>
                                     </ui-select>
 							 <!-- <pre>{{selectedSubjetcsSem1C.list | json}}</pre>  -->
@@ -385,11 +385,11 @@
 						<ui-select multiple ng-model="selectedSubjetcsSem2C.list"  tabindex="5" ng-change="removeSelectedSubjetcs(selectedSubjetcsSem2C.list);">
 						
                                         <ui-select-match placeholder="Select Subjetcs" >
-                                            {{$item.SubjectName}} 
+                                            {{$item.SubjectCode}}-{{$item.SubjectName}}  
                                         </ui-select-match>
                                         <ui-select-choices
                                                 repeat="x in subjects | filter:$select.search">
-                                            {{x.SubjectName}}
+                                            {{x.SubjectCode}}-{{x.SubjectName}}
                                         </ui-select-choices>
                                     </ui-select>
 							 <!-- <pre>{{selectedSubjetcsSem2C.list | json}}</pre>  -->
@@ -410,11 +410,11 @@
 						<ui-select multiple ng-model="selectedSubjetcsSem3C.list" tabindex="6" ng-change="removeSelectedSubjetcs(selectedSubjetcsSem3C.list);">
 						
                                         <ui-select-match placeholder="Select Subjetcs" >
-                                            {{$item.SubjectName}} 
+                                             {{$item.SubjectCode}}-{{$item.SubjectName}}  
                                         </ui-select-match>
                                         <ui-select-choices
                                                 repeat="x in subjects | filter:$select.search">
-                                            {{x.SubjectName}}
+                                            {{x.SubjectCode}}-{{x.SubjectName}}
                                         </ui-select-choices>
                                     </ui-select>
 							 <!-- <pre>{{selectedSubjetcsSem3C.list | json}}</pre>  -->
@@ -433,11 +433,11 @@
 						<ui-select multiple ng-model="selectedSubjetcsSem4C.list" tabindex="7" ng-change="removeSelectedSubjetcs(selectedSubjetcsSem4C.list);">
 						
                                         <ui-select-match placeholder="Select Subjetcs" >
-                                            {{$item.SubjectName}} 
+                                          {{$item.SubjectCode}}-{{$item.SubjectName}}  
                                         </ui-select-match>
                                         <ui-select-choices
                                                 repeat="x in subjects | filter:$select.search">
-                                            {{x.SubjectName}}
+                                            {{x.SubjectCode}}-{{x.SubjectName}}
                                         </ui-select-choices>
                                     </ui-select>
 							 <!-- <pre>{{selectedSubjetcsSem4C.list | json}}</pre>  -->
@@ -458,11 +458,11 @@
 						<ui-select multiple ng-model="selectedSubjetcsSem5C.list" tabindex="8" ng-change="removeSelectedSubjetcs(selectedSubjetcsSem5C.list);">
 						
                                         <ui-select-match placeholder="Select Subjetcs" >
-                                            {{$item.SubjectName}} 
+                                            {{$item.SubjectCode}}-{{$item.SubjectName}}  
                                         </ui-select-match>
                                         <ui-select-choices
                                                 repeat="x in subjects | filter:$select.search">
-                                            {{x.SubjectName}}
+                                            {{x.SubjectCode}}-{{x.SubjectName}}
                                         </ui-select-choices>
                                     </ui-select>
 							 <!-- <pre>{{selectedSubjetcsSem5C.list | json}}</pre>  -->
@@ -476,11 +476,11 @@
 						<ui-select multiple ng-model="selectedSubjetcsSem6C.list" tabindex="9" ng-change="removeSelectedSubjetcs(selectedSubjetcsSem6C.list);">
 						
                                         <ui-select-match placeholder="Select Subjetcs" >
-                                            {{$item.SubjectName}} 
+                                            {{$item.SubjectCode}}-{{$item.SubjectName}}  
                                         </ui-select-match>
                                         <ui-select-choices
                                                 repeat="x in subjects | filter:$select.search">
-                                            {{x.SubjectName}}
+                                             {{x.SubjectCode}}-{{x.SubjectName}}
                                         </ui-select-choices>
                                     </ui-select>
 							 <!-- <pre>{{selectedSubjetcsSem6C.list | json}}</pre>  -->
@@ -501,11 +501,11 @@
 						<ui-select multiple ng-model="selectedSubjetcsSem7C.list" tabindex="10" ng-change="removeSelectedSubjetcs(selectedSubjetcsSem7C.list);">
 						
                                         <ui-select-match placeholder="Select Subjetcs" >
-                                            {{$item.SubjectName}} 
+                                            {{$item.SubjectCode}}-{{$item.SubjectName}}  
                                         </ui-select-match>
                                         <ui-select-choices
                                                 repeat="x in subjects | filter:$select.search">
-                                            {{x.SubjectName}}
+                                             {{x.SubjectCode}}-{{x.SubjectName}}
                                         </ui-select-choices>
                                     </ui-select>
 							 <!-- <pre>{{selectedSubjetcsSem7C.list | json}}</pre>  -->
@@ -519,11 +519,11 @@
 						<ui-select multiple ng-model="selectedSubjetcsSem8C.list" tabindex="11" ng-change="removeSelectedSubjetcs(selectedSubjetcsSem8C.list);">
 						
                                         <ui-select-match placeholder="Select Subjetcs" >
-                                            {{$item.SubjectName}} 
+                                            {{$item.SubjectCode}}-{{$item.SubjectName}}  
                                         </ui-select-match>
                                         <ui-select-choices
                                                 repeat="x in subjects | filter:$select.search">
-                                            {{x.SubjectName}}
+                                             {{x.SubjectCode}}-{{x.SubjectName}}
                                         </ui-select-choices>
                                     </ui-select>
 							 <!-- <pre>{{selectedSubjetcsSem8C.list | json}}</pre>  -->

From f5ebd4fb2eb037d53a83eb4e5d067bbf5e18e71c Mon Sep 17 00:00:00 2001
From: gayathri1990 <maran7mca@gmail.com>
Date: Sat, 18 Aug 2018 10:42:03 +0530
Subject: [PATCH 2/2] daybook alert box text

---
 Apollo/assets/js/controllers/daybookadminCtrl.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Apollo/assets/js/controllers/daybookadminCtrl.js b/Apollo/assets/js/controllers/daybookadminCtrl.js
index eae15de8..8fd032e9 100755
--- a/Apollo/assets/js/controllers/daybookadminCtrl.js
+++ b/Apollo/assets/js/controllers/daybookadminCtrl.js
@@ -232,7 +232,7 @@ $scope.dayBookApprovalAccess = '';
 	$scope.deleted1 = function (id) {
       
 	 var id=id;
-	 var reason=prompt("Enter Reason!","");
+	 var reason=prompt("Enter Reason For Delete!","");
 	 $scope.deleteFeePayableEntry(reason,id);
 	}