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

Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec

Browse Source
This commit is contained in:
dineshkumarkannan 2018-08-28 13:58:23 +05:30
commit b5a990f8bf
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Apollo/assets/js/controllers/semcoursemapCtrl.js
View File

@ -745,11 +745,11 @@ else{
//console.log(myModel.Year); //console.log(myModel.Year);
//return false; //return false;
if(myModel.Year == undefined || myModel.Year =='') // if((myModel.Year == undefined || myModel.Year =='') && ($scope.Semval== undefined || $scope.Semval =='') )
{ // {
swal("Please Enter all the values","","error"); // swal("Please Enter all the values","","error");
return false; // return false;
} // }
if($scope.courseMode==1) if($scope.courseMode==1)

4
Apollo/assets/views/hallticket/semcoursemap.html
View File

@ -25,9 +25,9 @@
<div class="row"> <div class="row">
<div class="col-sm-8"> <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>
<div ncy-breadcrumb></div> <div ncy-breadcrumb></div>

2
Apollo/assets/views/status-update/setFeesForStudent.html
View File

@ -413,7 +413,7 @@
</a> </a>
</td> </td>
<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> </a></td>
</tr> </tr>