tanshu/brewman
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Removed unused AttendanceTypes

Browse Source
This commit is contained in:
tanshu
2015-03-16 14:52:27 +05:30
parent 6a815692bd
commit 1cc9ba6a01
4 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
brewman/models/master.py
+3 -5
View File
@@ -446,11 +446,9 @@ class AttendanceType:
list.append(AttendanceType(6, 'Double Duty', 2)) list.append(AttendanceType(6, 'Double Duty', 2))
list.append(AttendanceType(7, 'Paid Leave Availed', 1)) list.append(AttendanceType(7, 'Paid Leave Availed', 1))
list.append(AttendanceType(8, 'Casual Leave Availed', 1)) list.append(AttendanceType(8, 'Casual Leave Availed', 1))
list.append(AttendanceType(9, 'Overtime', 0)) list.append(AttendanceType(9, 'Compensatory Off', 1))
list.append(AttendanceType(10, 'Worked on Off Day', 1)) list.append(AttendanceType(10, 'Half Day + PL', 1))
list.append(AttendanceType(11, 'Compensatory Off', 1)) list.append(AttendanceType(11, 'Half Day + CL', 1))
list.append(AttendanceType(12, 'Half Day + PL', 1))
list.append(AttendanceType(13, 'Half Day + CL', 1))
return list return list
brewman/static/css/table.css
-8
View File
@@ -39,14 +39,6 @@
background-color: #800080; background-color: #800080;
} }
.table tbody tr.Overtime td:not(.no-bg) {
background-color: #006400;
}
.table tbody tr.OffWorked td:not(.no-bg) {
background-color: #F5DEB3;
}
.table tbody tr.COff td:not(.no-bg) { .table tbody tr.COff td:not(.no-bg) {
background-color: #F5DEB3; background-color: #F5DEB3;
} }
brewman/static/partial/attendance.html
+1 -1
View File
@@ -31,7 +31,7 @@
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="item in info.Body" <tr ng-repeat="item in info.Body"
ng-class="{0:'', 1:'Present', 2:'Off', 3:'Leave', 4:'Absent', 5:'HalfDay', 6:'Double', 7:'PaidLeaveAvailed', 8:'CasualLeaveAvailed', 9:'Overtime', 10:'OffWorked', 11:'COff', 12:'HalfPL', 13:'HalfCL'}[item.AttendanceTypeID]" ng-class="{0:'', 1:'Present', 2:'Off', 3:'Leave', 4:'Absent', 5:'HalfDay', 6:'Double', 7:'PaidLeaveAvailed', 8:'CasualLeaveAvailed', 9:'COff', 10:'HalfPL', 11:'HalfCL'}[item.AttendanceTypeID]"
ng-controller="AttendanceSubController"> ng-controller="AttendanceSubController">
<td class="text-right">{{item.Code}}</td> <td class="text-right">{{item.Code}}</td>
<td><i class="glyphicon glyphicon-leaf" ng-show="isDirty()"></i> {{item.Name}}</td> <td><i class="glyphicon glyphicon-leaf" ng-show="isDirty()"></i> {{item.Name}}</td>
brewman/static/partial/employee-attendance.html
+1 -1
View File
@@ -49,7 +49,7 @@
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="item in info.Body" <tr ng-repeat="item in info.Body"
ng-class="{0:'', 1:'Present', 2:'Off', 3:'Leave', 4:'Absent', 5:'HalfDay', 6:'Double', 7:'PaidLeaveAvailed', 8:'CasualLeaveAvailed', 9:'Overtime', 10:'OffWorked', 11:'COff', 12:'HalfPL', 13:'HalfCL'}[item.AttendanceTypeID]" ng-class="{0:'', 1:'Present', 2:'Off', 3:'Leave', 4:'Absent', 5:'HalfDay', 6:'Double', 7:'PaidLeaveAvailed', 8:'CasualLeaveAvailed', 9:'COff', 10:'HalfPL', 11:'HalfCL'}[item.AttendanceTypeID]"
ng-controller="EmployeeAttendanceSubController"> ng-controller="EmployeeAttendanceSubController">
<td>{{item.Date}}</td> <td>{{item.Date}}</td>
<td> <td>