DMC/scipro
7
0
Fork 0
Code Issues42 Pull Requests4 Actions Projects1 Releases Wiki Activity

master added also

Browse Source
This commit is contained in:
Fredrik Friis 2012-02-08 14:46:40 +09:00
parent 30da9bed86
commit 17946b117c
4 changed files with 16 additions and 6 deletions

2
src/main/java/se/su/dsv/scipro/match/dao/interfaces/SupervisorDao.java

@ -30,5 +30,5 @@ public interface SupervisorDao extends QueryableDao<Employee, SupervisorDaoParam
void setAvailability(Availability availability);
void resetBachelorTargetCountFromDate(ProjectClass projectClass);
void resetCountFromDate(ProjectClass projectClass);
}

2
src/main/java/se/su/dsv/scipro/match/dao/jpa/SupervisorDaoJPAImp.java

@ -241,7 +241,7 @@ public class SupervisorDaoJPAImp extends
@Override
@Transactional(readOnly=false)
public void resetBachelorTargetCountFromDate(ProjectClass projectClass) {
public void resetCountFromDate(ProjectClass projectClass) {
List<Employee> supervisors = getCapableSupervisors(projectClass);
for (Employee e : supervisors){
e.setCountFromDate(projectClass, new Date());

7
src/main/java/se/su/dsv/scipro/match/panel/AdminManageSupervisorPanel.html

@ -21,7 +21,8 @@
</div>
<div class="span-5 last append-bottom">
<!-- <div><button wicket:id="resetBachelorButton"></button></div> -->
<div><button wicket:id="resetAllBachelorButton">Reset all supervisor bachelor count numbers</button></div>
<div><button wicket:id="resetAllBachelorButton">Reset all supervisor Bachelor count numbers</button></div>
<div><button wicket:id="resetAllMasterButton">Reset all supervisor Master count numbers</button></div>
</div>
@ -38,8 +39,8 @@
<th>Unit</th>
<th>Target bachelor</th>
<th>Target master</th>
<th>Current bachelor (counting since)</th>
<th class="rounded-right-top">Current master (counting since)</th>
<th>Bachelors taken (counting since)</th>
<th class="rounded-right-top">Masters taken (counting since)</th>
</tr>
</thead>
<tfoot>

11
src/main/java/se/su/dsv/scipro/match/panel/AdminManageSupervisorPanel.java

@ -238,12 +238,21 @@ public class AdminManageSupervisorPanel extends Panel {
AjaxLink resetAllBachelor = new AjaxLink("resetAllBachelorButton"){
@Override
public void onClick(AjaxRequestTarget target) {
supervisorDao.resetBachelorTargetCountFromDate(projectClassDao.getProjectClass("BACHELOR"));
supervisorDao.resetCountFromDate(projectClassDao.getProjectClass("BACHELOR"));
}
};
add(resetAllBachelor);
AjaxLink resetAllMaster = new AjaxLink("resetAllMasterButton"){
@Override
public void onClick(AjaxRequestTarget target) {
supervisorDao.resetCountFromDate(projectClassDao.getProjectClass("MASTER"));
}
};
add(resetAllMaster);
}
}
}