| 4,13 → 4,13 |
|---|
| import org.apache.struts.action.ActionForm; |
| import org.apache.struts.action.ActionForward; |
| import org.apache.struts.action.ActionMapping; |
| import pt.estgp.estgweb.utils.Globals; |
| import pt.estgp.estgweb.domain.UserSessionImpl; |
| import pt.estgp.estgweb.domain.views.*; |
| import pt.estgp.estgweb.utils.DatesWebUtils; |
| import pt.estgp.estgweb.utils.Globals; |
| import pt.estgp.estgweb.web.UserSessionProxy; |
| import pt.estgp.estgweb.web.controllers.AddRolesController; |
| import pt.estgp.estgweb.web.form.assessments.AssessmentsForm; |
| import pt.estgp.estgweb.utils.DatesWebUtils; |
| import pt.estgp.estgweb.web.utils.DomainUtils; |
| import pt.estgp.estgweb.web.utils.RequestUtils; |
| import pt.utl.ist.berserk.logic.serviceManager.IServiceManager; |
| 21,8 → 21,9 |
|---|
| import javax.servlet.http.HttpServletRequest; |
| import javax.servlet.http.HttpServletResponse; |
| import java.io.Serializable; |
| import java.sql.Time; |
| import java.util.ArrayList; |
| import java.util.Calendar; |
| import java.util.GregorianCalendar; |
| import java.util.List; |
| |
| /** |
| 668,23 → 669,38 |
|---|
| { |
| view.setStartDate(DatesWebUtils.getDateFromString(assessmentsForm.getStartDate())); |
| view.setEndDate(DatesWebUtils.getDateFromString(assessmentsForm.getStartDate())); //a data de fim fica a mesma que a data de inicio |
| view.getEndDate().setHours(23); |
| view.getEndDate().setMinutes(59); |
| view.getEndDate().setSeconds(59); |
| GregorianCalendar c = new GregorianCalendar(); |
| c.setTime(view.getEndDate()); |
| c.set(Calendar.HOUR_OF_DAY,23); |
| c.set(Calendar.MINUTE,59); |
| c.set(Calendar.SECOND,59); |
| view.setEndDate(c.getTime()); |
| } |
| if(view.getType().equals(Globals.ASSESSMENT_TYPE_SELFEVALUATION)) |
| { |
| view.setStartDate(DatesWebUtils.getDateFromString(assessmentsForm.getStartDate())); |
| view.setEndDate(DatesWebUtils.getDateFromString(assessmentsForm.getEndDate())); |
| view.getEndDate().setHours(23); |
| view.getEndDate().setMinutes(59); |
| view.getEndDate().setSeconds(59); |
| GregorianCalendar c = new GregorianCalendar(); |
| c.setTime(view.getEndDate()); |
| c.set(Calendar.HOUR_OF_DAY,23); |
| c.set(Calendar.MINUTE,59); |
| c.set(Calendar.SECOND,59); |
| view.setEndDate(c.getTime()); |
| } |
| //tratar dos tempos |
| String[] times = assessmentsForm.getTime().split("\\:"); |
| int hours = Integer.parseInt(times[0]); |
| int minutes = Integer.parseInt(times[1]); |
| view.setTime(new Time(hours,minutes,0)); |
| GregorianCalendar c = new GregorianCalendar(); |
| c.setTime(view.getEndDate()); |
| c.set(Calendar.YEAR,1970); |
| c.set(Calendar.MONTH,0); |
| c.set(Calendar.DAY_OF_MONTH,1); |
| c.set(Calendar.HOUR_OF_DAY,hours); |
| c.set(Calendar.MINUTE,minutes); |
| c.set(Calendar.SECOND,0); |
| view.setEndDate(c.getTime()); |
| view.setTime(c.getTime()); |
| //tratar os alunos selecionados |
| List<Long> selectedUsersId = new ArrayList<Long>(); |
| for(int i=0;i<assessmentsForm.getSelectedUsers().length;i++) |