Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec
This commit is contained in:
commit
b5a990f8bf
@ -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)
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user