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:
gandhimathi 2018-08-17 17:56:02 +05:30
commit e70d59af73
8 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Apollo/assets/views/activity.html
View File

@ -85,12 +85,12 @@
<input type="submit" value="Submit" ladda="ldloading1.zoom_in" tabindex="9" class="btn btn-wide btn-success" data-style="zoom-in"/>
</div>-->
<div class="col-md-2" style="padding-top: 2.3%;">
<div class="col-md-2" >
<div class="pull-right">
<!--<button type="submit" ladda="ldloading1.zoom_in" tabindex="4" class="btn btn-wide btn-success" data-style="zoom-in"/>
Submit
</button>-->
<button type="submit" ladda="ldloading.zoom_in" tabindex="4" class="btn btn-wide btn-success" data-style="zoom-in">
<button style="margin-top:20px;" type="submit" ladda="ldloading.zoom_in" tabindex="4" class="btn btn-wide btn-success" data-style="zoom-in">
Add
</button>
</div>

6
Apollo/assets/views/add_income_expense.html
View File

@ -36,9 +36,9 @@
<span class="error text-small block" ng-if="Form.StatusName.$dirty && Form.StatusName.$error.required">Account Name is required</span>
<span class="error text-small block" ng-if="Form.StatusName.$dirty && Form.StatusName.$error.pattern">Invalid Account Name </span>
</div>
<div class="col-md-2" style="padding-top: 2.3%;">
<div class="col-md-2" >
<div class="pull-right">
<button style="margin-top:-6px;" type="submit" ladda="ldloading1.zoom_in" tabindex="2" class="btn btn-wide btn-success" data-style="zoom-in">
<button style="margin-top:20px;" type="submit" ladda="ldloading1.zoom_in" tabindex="2" class="btn btn-wide btn-success" data-style="zoom-in">
Add
</button>
</div>
@ -68,7 +68,7 @@
<span class="glyphicon sort-icon" ng-show="sortKey=='ListName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"> </span>
</th>
<th>Status</th>
<th></th>
<th>Action</th>
</tr>
</thead>
<!-- {{statusInfo}} -->

2
Apollo/assets/views/announcement/Announcement.html
View File

@ -68,7 +68,7 @@
<th ng-click="sort('Active/De-Active')">Status
<span class="glyphicon sort-icon" ng-show="sortKey=='Active/De-Active'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
</th>
<th></th>
<th>Action</th>
</tr>
</thead>
<tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10">

4
Apollo/assets/views/certificate/certificate.html
View File

@ -65,9 +65,9 @@
</div>
</div>-->
<div class="col-md-2" style="padding-top: 2.3%;">
<div class="col-md-2">
<div class="pull-right">
<button style="margin-top:-6px;" type="submit" ladda="ldloading1.zoom_in" tabindex="2" class="btn btn-wide btn-success" data-style="zoom-in" >
<button style="margin-top:20px;" type="submit" ladda="ldloading1.zoom_in" tabindex="2" class="btn btn-wide btn-success" data-style="zoom-in" >
Add
</button>
<!-- <button type="submit" class="btn btn-success btn-o" tabindex="8">

11
Apollo/assets/views/hallticket/examAttendancePDF.html
View File

@ -31,11 +31,10 @@
<div id="student_list_AM">
<table width="100%" border="1" id = "attendanceTableAM" style="background-color:#fff;" ng-if="studentInfoAM_Length != 0">
<<<<<<< HEAD
<thead><tr> <th>SNO</th> <th>STUDENT NAME</th> <th>COURSE</th> <th>SEM/YEAR</th> <th>ENROLLMENT NO</th> <th>SUBJECT CODE</th> <th>SUBJECT NAME</th><th>BOOKLET NO</th> <th>STUDENT SIGNATURE</th> </tr></thead>
=======
<thead><tr> <th>SNO</th> <th>STUDENT NAME</th> <th>COURSE</th> <th>SEM/YEAR</th> <th>ENROLLMENT NO</th> <th>SUBJECT CODE</th> <th>SUBJECT NAME</th><th>BOOKLET NO</th> <th>STUDENT SIGN</th> </tr></thead>
>>>>>>> 145988e7a66409e847e30051cbe103b3fdcfb907
<thead><tr> <th>SNO</th> <th>STUDENT NAME</th> <th>COURSE</th> <th>SEM/YEAR</th> <th>ENROLLMENT NO</th> <th>SUBJECT CODE</th> <th>SUBJECT NAME</th><th>BOOKLET NO</th> <th>STU SIGN</th> </tr></thead>
<tbody>
<tr ng-repeat="student in dataForExamAttendanceAM" >
<td>{{($index+1)}}</td> <td>{{student.Firstname}} {{student.Lastname}} </td><td>{{student.CourseName}}</td><td>{{student.Sem_Year}}</td><td>{{student.EnrollmentID}}</td><td>{{student.SubjectCode}}</td><td>{{student.SubjectName}}</td><td></td><td></td>
@ -47,7 +46,7 @@
<div id="student_list_PM">
<table width="100%" border="1" id = "attendanceTablePM" style="background-color:#fff;" ng-if="studentInfoPM_Length != 0">
<thead><tr> <th>SNO</th> <th>STUDENT NAME</th> <th>COURSE</th> <th>SEM/YEAR</th> <th>ENROLLMENT NO</th> <th>SUBJECT CODE</th> <th>SUBJECT NAME</th><th>BOOKLET NO</th> <th>STUDENT SIGN</th> </tr></thead>
<thead><tr> <th>SNO</th> <th>STUDENT NAME</th> <th>COURSE</th> <th>SEM/YEAR</th> <th>ENROLLMENT NO</th> <th>SUBJECT CODE</th> <th>SUBJECT NAME</th><th>BOOKLET NO</th> <th>STU SIGN</th> </tr></thead>
<tbody>
<tr ng-repeat="student in dataForExamAttendancePM" >
<td>{{($index+1)}}</td> <td>{{student.Firstname}} {{student.Lastname}} </td><td>{{student.CourseName}}</td><td>{{student.Sem_Year}}</td><td>{{student.EnrollmentID}}</td><td>{{student.SubjectCode}}</td><td>{{student.SubjectName}}</td><td></td><td></td>

4
Apollo/assets/views/status.html
View File

@ -36,9 +36,9 @@
<span class="error text-small block" ng-if="Form.StatusName.$dirty && Form.StatusName.$error.required">Status name is required</span>
<span class="error text-small block" ng-if="Form.StatusName.$dirty && Form.StatusName.$error.pattern">Invalid Status name </span>
</div>
<div class="col-md-2" style="padding-top: 2.3%;">
<div class="col-md-2" >
<div class="pull-right">
<button style="margin-top:-6px;" type="submit" ladda="ldloading1.zoom_in" tabindex="2" class="btn btn-wide btn-success" data-style="zoom-in">
<button style="margin-top:20px;" type="submit" ladda="ldloading1.zoom_in" tabindex="2" class="btn btn-wide btn-success" data-style="zoom-in">
Add
</button>
</div>

5
Apollo/assets/views/student/student_details.html
View File

@ -210,9 +210,10 @@
<td>{{p.UniversityName}}</td>
<td>{{p.CourseName}}</td>
<td><span ng-if="p.IsActive == true" style="text-transform: uppercase; text-shadow: 1px 1px #166307; color: #2be209 ">ACTIVE</span>
<span tooltip="{{p.DeactiveComments}}" ng-if="p.IsActive == false" style="text-transform: uppercase; text-shadow: 1px 1px rgb(167, 88, 15); color: rgba(236, 24, 24, 0.98823529);">DEACTIVE</span></td>
<span tooltip="{{p.DeactiveComments}}" ng-if="p.IsActive == false" style="text-transform: uppercase; text-shadow: 1px 1px rgb(167, 88, 15); color: rgba(236, 24, 24, 0.98823529);">DEACTIVE
</span></td>
<td>
<div id="containersPara">{{p.Comments}}</div>
{{p.Comments}}
</td>
<td style="text-align: center;">
<!--<input type=button class="btn btn-info btn-xs" ladda="ldloading1.zoom_in" id="editRowBtn{{p.StudentID}}" value="Personal Details"

6
Apollo/assets/views/subjectMaster.html
View File

@ -71,7 +71,7 @@
<th>Status</th>
<th></th>
<th>Action</th>
</tr>
</thead>
@ -187,9 +187,9 @@
</div>
</br>
<div class="row">
<div class="col-md-12">
<div class="col-md-11">
<div class="pull-right">
<button type="submit" ng-disabled="disableButton" tabindex="3" class="btn btn-wide btn-success"
data-style="zoom-in"> Submit </button>