From 618416c626e191177c937a0e42f382619d1fd814 Mon Sep 17 00:00:00 2001
From: kupcimat <kupcimat@fel.cvut.cz>
Date: Sat, 26 Feb 2011 22:37:04 +0100
Subject: [PATCH] Adding more info to updateLesson dialog, adding time check to
 createLesson dialo

---
 .../org/cvut/skischool/back/TimetableBean.java     | 21 ++++++++---
 SkiSchool-war/web/timetable.xhtml                  | 44 +++++++++++++++++++++-
 2 files changed, 57 insertions(+), 8 deletions(-)

diff --git a/SkiSchool-war/src/java/org/cvut/skischool/back/TimetableBean.java b/SkiSchool-war/src/java/org/cvut/skischool/back/TimetableBean.java
index d825d84..b526f3b 100644
--- a/SkiSchool-war/src/java/org/cvut/skischool/back/TimetableBean.java
+++ b/SkiSchool-war/src/java/org/cvut/skischool/back/TimetableBean.java
@@ -264,6 +264,21 @@ public class TimetableBean implements Serializable {
     }
 
     public void createLesson(ActionEvent event) {
+        List<Instructor> instructorsTmp = new ArrayList<Instructor>();
+        instructorsTmp.add(selectedInstructor);
+        Date startTime = DateTools.makeDateTime(date, startHour, startMinute, 0);
+        Date endTime = DateTools.makeDateTime(date, endHour, endMinute, 0);
+
+        // check whether time is mismatched
+        if (endTime.before(startTime)) {
+            showErrorMessage("End time is before start time");
+            return;
+        }
+        // check whether time equals
+        if (startTime.equals(endTime)) {
+            showErrorMessage("Start time equals end time");
+            return;
+        }
         // check whether is selected instructor
         if (selectedInstructor == null) {
             showErrorMessage("createLesson:instructor", "You must add at least 1 instructor", "Empty instructor");
@@ -274,12 +289,6 @@ public class TimetableBean implements Serializable {
             showErrorMessage("createLesson:student", "You must add at least 1 student", "Empty student");
             return;
         }
-
-        List<Instructor> instructorsTmp = new ArrayList<Instructor>();
-        instructorsTmp.add(selectedInstructor);
-        Date startTime = DateTools.makeDateTime(date, startHour, startMinute, 0);
-        Date endTime = DateTools.makeDateTime(date, endHour, endMinute, 0);
-
         // check whether instructor is available
         List<Instructor> conflictInstructors = lessonManagement.checkLessonAvailability(startTime, endTime, instructorsTmp);
         if (conflictInstructors.size() > 0) {
diff --git a/SkiSchool-war/web/timetable.xhtml b/SkiSchool-war/web/timetable.xhtml
index 65f49f0..c5b2fd8 100644
--- a/SkiSchool-war/web/timetable.xhtml
+++ b/SkiSchool-war/web/timetable.xhtml
@@ -234,10 +234,50 @@
                     <h:form id="updateLesson">
                         <p:panel>
                             <h:panelGrid columns="2">
-                                <h:outputText value="Executed: "/>
+                                <h:outputText value="Date:"/>
+                                <h:outputText value="#{timetableBean.lesson.startTime}">
+                                    <f:convertDateTime pattern="dd. MM. yyyy"
+                                                       timeZone="GMT+1"/>
+                                </h:outputText>
+
+                                <h:outputText value="Time:"/>
+                                <h:panelGroup>
+                                    <h:outputText value="#{timetableBean.lesson.startTime}">
+                                        <f:convertDateTime pattern="HH:mm"
+                                                           timeZone="GMT+1"/>
+                                    </h:outputText>
+                                    <h:outputText value=" - "/>
+                                    <h:outputText value="#{timetableBean.lesson.endTime}">
+                                        <f:convertDateTime pattern="HH:mm"
+                                                           timeZone="GMT+1"/>
+                                    </h:outputText>
+                                </h:panelGroup>
+
+                                <h:outputText value="Type:"/>
+                                <h:outputText value="#{timetableBean.lesson.lessonType}"/>
+
+                                <h:outputText value="Instructors:"/>
+                                <h:dataTable value="#{timetableBean.lesson.instructors}" var="instructor">
+                                    <h:column>
+                                        <h:outputText value="#{instructor.firstName} #{instructor.lastName}"/>
+                                    </h:column>
+                                </h:dataTable>
+
+                                <h:outputText value="Students:"/>
+                                <h:dataTable value="#{timetableBean.lesson.students}" var="student">
+                                    <h:column>
+                                        <h:outputText value="#{student.firstName} #{student.lastName}"/>
+                                    </h:column>
+                                </h:dataTable>
+                            </h:panelGrid>
+                        </p:panel>
+                        
+                        <p:panel>
+                            <h:panelGrid columns="2">
+                                <h:outputText value="Executed:"/>
                                 <h:selectBooleanCheckbox value="#{timetableBean.lesson.executed}"/>
 
-                                <h:outputText value="Paid: "/>
+                                <h:outputText value="Paid:"/>
                                 <h:selectBooleanCheckbox value="#{timetableBean.lesson.paid}"/>
                             </h:panelGrid>
                         </p:panel>
-- 
2.11.4.GIT