From 8ed1f788b2ff27b948095602d9670401280bdec9 Mon Sep 17 00:00:00 2001
From: gias <gias89@gmail.com>
Date: Fri, 4 Mar 2011 20:05:46 +0100
Subject: [PATCH] Step back in refactoring, case sensitive ignored in
 autocomplite, adding lesson type sort condition, first name is not required
 now

---
 .../org/cvut/skischool/beans/LessonManagement.java |   8 +-
 .../skischool/beans/LessonManagementLocal.java     |   5 +-
 .../org/cvut/skischool/beans/UserManagement.java   |   5 +-
 .../java/org/cvut/skischool/core/DateTools.java    |  12 ++
 .../java/org/cvut/skischool/model/Instructor.java  |   4 +-
 .../src/java/org/cvut/skischool/model/Lesson.java  |   4 +-
 .../src/java/org/cvut/skischool/model/Person.java  |   1 -
 .../src/java/org/cvut/skischool/model/Student.java |   4 +-
 .../org/cvut/skischool/back/KindergartenBean.java  |  10 +-
 .../java/org/cvut/skischool/back/LessonsBean.java  |  10 +-
 .../java/org/cvut/skischool/back/SelectBean.java   |  22 +++-
 .../java/org/cvut/skischool/back/StudentsBean.java |   2 +
 .../org/cvut/skischool/back/TimetableBean.java     |  10 +-
 .../org/cvut/skischool/translation_en.properties   | 125 ++++++++++++++++++
 SkiSchool-war/web/WEB-INF/skiSchoolTemplate.xhtml  | 142 ++++++++++-----------
 SkiSchool-war/web/createinstructor.xhtml           |   2 +-
 SkiSchool-war/web/createstudent.xhtml              |   4 +-
 SkiSchool-war/web/instructorlessons.xhtml          |  22 ++--
 SkiSchool-war/web/kindergarten.xhtml               |   8 +-
 SkiSchool-war/web/lessons.xhtml                    |   6 +-
 SkiSchool-war/web/payments.xhtml                   |  12 +-
 SkiSchool-war/web/studentlessons.xhtml             |  20 +--
 SkiSchool-war/web/timetable.xhtml                  |  31 ++++-
 SkiSchool-war/web/users.xhtml                      |   2 +-
 24 files changed, 329 insertions(+), 142 deletions(-)
 create mode 100644 SkiSchool-war/src/java/org/cvut/skischool/translation_en.properties
 rewrite SkiSchool-war/web/WEB-INF/skiSchoolTemplate.xhtml (88%)

diff --git a/SkiSchool-ejb/src/java/org/cvut/skischool/beans/LessonManagement.java b/SkiSchool-ejb/src/java/org/cvut/skischool/beans/LessonManagement.java
index 01a4a5b..d5a7343 100644
--- a/SkiSchool-ejb/src/java/org/cvut/skischool/beans/LessonManagement.java
+++ b/SkiSchool-ejb/src/java/org/cvut/skischool/beans/LessonManagement.java
@@ -134,16 +134,16 @@ public class LessonManagement implements LessonManagementLocal {
     }
 
     @Override
-    public long countLessons(Instructor instructor, Date startDate, Date endDate, String type) {
+    public List<Lesson> countLessons(Instructor instructor, Date startDate, Date endDate, String type) {
         Query q = em.createNamedQuery("Lesson.countLessons");
-        Long lessonsCount = (Long) q
+        List<Lesson> lessons = (List<Lesson>) q
                 .setParameter("instructor", instructor)
                 .setParameter("startDate", startDate, TemporalType.TIMESTAMP)
                 .setParameter("endDate", endDate, TemporalType.TIMESTAMP)
                 .setParameter("type", type)
-                .getSingleResult();
+                .getResultList();
 
-        return lessonsCount;
+        return lessons;
     }
 
     @Override
diff --git a/SkiSchool-ejb/src/java/org/cvut/skischool/beans/LessonManagementLocal.java b/SkiSchool-ejb/src/java/org/cvut/skischool/beans/LessonManagementLocal.java
index 25915fd..24d086e 100644
--- a/SkiSchool-ejb/src/java/org/cvut/skischool/beans/LessonManagementLocal.java
+++ b/SkiSchool-ejb/src/java/org/cvut/skischool/beans/LessonManagementLocal.java
@@ -30,7 +30,7 @@ public interface LessonManagementLocal {
      * @return instructors who are not available during specified time
      */
     List<Instructor> checkLessonAvailability(Date startTime, Date endTime, List<Instructor> instructors);
-    
+
     /**
      * Check lesson whether all instructors have any other reserved lessons
      * conflicting with the specified lesson.
@@ -50,8 +50,7 @@ public interface LessonManagementLocal {
 
     long countLessonsLangBonus(Instructor instructor, Date startDate, Date endDate);
 
-    long countLessons(Instructor instructor, Date startDate, Date endDate, String type);
+    List<Lesson> countLessons(Instructor instructor, Date startDate, Date endDate, String type);
 
     List<Lesson> getLessonsByStudentAndInterval(Student student, Date startDate, Date endDate);
-
 }
diff --git a/SkiSchool-ejb/src/java/org/cvut/skischool/beans/UserManagement.java b/SkiSchool-ejb/src/java/org/cvut/skischool/beans/UserManagement.java
index f55735d..a85f52f 100644
--- a/SkiSchool-ejb/src/java/org/cvut/skischool/beans/UserManagement.java
+++ b/SkiSchool-ejb/src/java/org/cvut/skischool/beans/UserManagement.java
@@ -3,6 +3,7 @@ package org.cvut.skischool.beans;
 import java.util.List;
 import javax.annotation.security.RolesAllowed;
 import javax.ejb.Stateless;
+import javax.mail.search.SearchException;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import org.cvut.skischool.model.Instructor;
@@ -27,7 +28,7 @@ public class UserManagement implements UserManagementLocal {
     @Override
     public List<Student> getStudentsByName(String name) {
         List<Student> students = (List<Student>) em.createNamedQuery("Student.getStudentsByName")
-                .setParameter("name", "%" + name + "%")
+                .setParameter("name", "%" + name.toUpperCase().replace(" ", "") + "%")
                 .getResultList();
         return students;
     }
@@ -41,7 +42,7 @@ public class UserManagement implements UserManagementLocal {
     @Override
     public List<Instructor> getInstructorsByName(String name) {
         List<Instructor> instructors = (List<Instructor>) em.createNamedQuery("Instructor.getInstructorsByName")
-                .setParameter("name", "%" + name + "%")
+                .setParameter("name", "%" + name.toUpperCase().replace(" ","") + "%")
                 .getResultList();
         return instructors;
     }
diff --git a/SkiSchool-ejb/src/java/org/cvut/skischool/core/DateTools.java b/SkiSchool-ejb/src/java/org/cvut/skischool/core/DateTools.java
index cb91bae..2b1acb8 100644
--- a/SkiSchool-ejb/src/java/org/cvut/skischool/core/DateTools.java
+++ b/SkiSchool-ejb/src/java/org/cvut/skischool/core/DateTools.java
@@ -106,6 +106,18 @@ public class DateTools {
         return hours;
     }
 
+    public static long hoursDifference(Date startTime, Date endTime) {
+        long hours = 0;
+        Calendar cStartTime = Calendar.getInstance();
+        Calendar cEndTime = Calendar.getInstance();
+        cStartTime.setTime(startTime);
+        cEndTime.setTime(endTime);
+        long startHour = cStartTime.get(Calendar.HOUR_OF_DAY);
+        long endHour = cEndTime.get(Calendar.HOUR_OF_DAY);
+        hours = endHour - startHour;
+        return hours;
+    }
+
     public static boolean equalsTime(Date time1, Date time2) {
         if ((time1 == null) || (time2 == null)) {
             return false;
diff --git a/SkiSchool-ejb/src/java/org/cvut/skischool/model/Instructor.java b/SkiSchool-ejb/src/java/org/cvut/skischool/model/Instructor.java
index b887560..e0cf433 100644
--- a/SkiSchool-ejb/src/java/org/cvut/skischool/model/Instructor.java
+++ b/SkiSchool-ejb/src/java/org/cvut/skischool/model/Instructor.java
@@ -19,9 +19,9 @@ import javax.validation.constraints.NotNull;
 @DiscriminatorValue(value = "instructor")
 @NamedQueries({
     @NamedQuery(name = "Instructor.getAllInstructors",
-    query = "SELECT i FROM Instructor i"),
+    query = "SELECT i FROM Instructor i ORDER BY i.lastName"),
     @NamedQuery(name = "Instructor.getInstructorsByName",
-    query = "SELECT i FROM Instructor i WHERE (i.firstName LIKE :name) OR (i.lastName LIKE :name)")})
+    query = "SELECT i FROM Instructor i WHERE (UPPER (i.firstName) LIKE :name) OR (UPPER (i.lastName) LIKE :name)")})
 public class Instructor extends Person implements Serializable {
 
     @NotNull(message = "{null}")
diff --git a/SkiSchool-ejb/src/java/org/cvut/skischool/model/Lesson.java b/SkiSchool-ejb/src/java/org/cvut/skischool/model/Lesson.java
index fd48b3f..4601b7f 100644
--- a/SkiSchool-ejb/src/java/org/cvut/skischool/model/Lesson.java
+++ b/SkiSchool-ejb/src/java/org/cvut/skischool/model/Lesson.java
@@ -26,7 +26,7 @@ import org.cvut.skischool.core.NumberConstants;
 @Entity
 @NamedQueries({
     @NamedQuery(name = "Lesson.getAllLessons",
-    query = "SELECT l FROM Lesson l"),
+    query = "SELECT l FROM Lesson l ORDER BY l.startTime DESC"),
     @NamedQuery(name = "Lesson.getLessonsByDate",
     query = "SELECT l FROM Lesson l JOIN l.instructors i WHERE (i = :instructor) AND (l.startTime BETWEEN :dayBegin AND :dayEnd) ORDER BY l.startTime"),
     @NamedQuery(name = "Lesson.getLessonsByInstructorAndTime",
@@ -34,7 +34,7 @@ import org.cvut.skischool.core.NumberConstants;
     @NamedQuery(name = "Lesson.countLessonsLangBonus",
     query = "SELECT COUNT(l) FROM Lesson l JOIN l.instructors i WHERE (i = :instructor) AND (l.language IS NOT NULL) AND (l.startTime BETWEEN :startDate AND :endDate)"),
     @NamedQuery(name = "Lesson.countLessons",
-    query = "SELECT COUNT(l) FROM Lesson l JOIN l.instructors i WHERE (i = :instructor) AND (l.lessonType = :type) AND (l.startTime BETWEEN :startDate AND :endDate)"),
+    query = "SELECT l FROM Lesson l JOIN l.instructors i WHERE (i = :instructor) AND (l.lessonType = :type) AND (l.startTime BETWEEN :startDate AND :endDate)"),
     @NamedQuery(name = "Lesson.getLessonsByInstructorAndInterval",
     query = "SELECT l FROM Lesson l JOIN l.instructors i WHERE (i = :instructor) AND (l.startTime BETWEEN :startDate AND :endDate) ORDER BY l.startTime DESC"),
     @NamedQuery(name = "Lesson.getLessonsByStudentAndInterval",
diff --git a/SkiSchool-ejb/src/java/org/cvut/skischool/model/Person.java b/SkiSchool-ejb/src/java/org/cvut/skischool/model/Person.java
index a3a6762..89cf0dc 100644
--- a/SkiSchool-ejb/src/java/org/cvut/skischool/model/Person.java
+++ b/SkiSchool-ejb/src/java/org/cvut/skischool/model/Person.java
@@ -23,7 +23,6 @@ public class Person implements Serializable {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     private Long id;
-    @Size(min = 1, message = "{null}")
     private String firstName;
     @Size(min = 1, message = "{null}")
     private String lastName;
diff --git a/SkiSchool-ejb/src/java/org/cvut/skischool/model/Student.java b/SkiSchool-ejb/src/java/org/cvut/skischool/model/Student.java
index d903dd7..60a8b4b 100644
--- a/SkiSchool-ejb/src/java/org/cvut/skischool/model/Student.java
+++ b/SkiSchool-ejb/src/java/org/cvut/skischool/model/Student.java
@@ -18,9 +18,9 @@ import javax.validation.constraints.NotNull;
 @DiscriminatorValue(value = "student")
 @NamedQueries({
     @NamedQuery(name = "Student.getAllStudents",
-    query = "SELECT s FROM Student s"),
+    query = "SELECT s FROM Student s ORDER BY s.lastName"),
     @NamedQuery(name = "Student.getStudentsByName",
-    query = "SELECT s FROM Student s WHERE (s.firstName LIKE :name) OR (s.lastName LIKE :name)")})
+    query = "SELECT s FROM Student s WHERE (UPPER (s.firstName) LIKE :name) OR (UPPER (s.lastName) LIKE :name)")})
 public class Student extends Person implements Serializable {
 
     private int age;
diff --git a/SkiSchool-war/src/java/org/cvut/skischool/back/KindergartenBean.java b/SkiSchool-war/src/java/org/cvut/skischool/back/KindergartenBean.java
index 2d2d75f..40d5a0b 100644
--- a/SkiSchool-war/src/java/org/cvut/skischool/back/KindergartenBean.java
+++ b/SkiSchool-war/src/java/org/cvut/skischool/back/KindergartenBean.java
@@ -244,11 +244,11 @@ public class KindergartenBean implements Serializable {
             showErrorMessage("Prosím zadajte meno žiaka");
             return;
         }
-        if (newStudent.getFirstName() == null) {
-//            showErrorMessage("Please enter first name and last name");
-            showErrorMessage("Prosím zadajte meno a prezvisko žiaka");
-            return;
-        }
+//        if (newStudent.getFirstName() == null) {
+////            showErrorMessage("Please enter first name and last name");
+//            showErrorMessage("Prosím zadajte meno a prezvisko žiaka");
+//            return;
+//        }
 
         newStudent.setGroupSize(1);
         newStudent.setDisabled(false);
diff --git a/SkiSchool-war/src/java/org/cvut/skischool/back/LessonsBean.java b/SkiSchool-war/src/java/org/cvut/skischool/back/LessonsBean.java
index 700fd92..baa4981 100644
--- a/SkiSchool-war/src/java/org/cvut/skischool/back/LessonsBean.java
+++ b/SkiSchool-war/src/java/org/cvut/skischool/back/LessonsBean.java
@@ -26,12 +26,20 @@ public class LessonsBean implements Serializable {
     private LessonManagementLocal lessonManagement;
     private DataModel<Lesson> lessons;
     private SelectItem[] executedLessonOptions;
+    private SelectItem[] lessonTypeOptions;
 
     public LessonsBean() {
         String[] data = {"true", "false"};
         String[] names = {"Prebehli", "Neprebehli"};
+        String[] lessonTypeDate = {"individual", "group", "kindergarten"};
+        String[] lessonTypeNames = {"Individuálne", "Skupinové", "Škôlka"};
 //        String[] names = {"Executed", "Not executed"};
         executedLessonOptions = createFilterOptions(data, names);
+        lessonTypeOptions = createFilterOptions(lessonTypeDate, lessonTypeNames);
+    }
+
+    public SelectItem[] getLessonTypeOptions() {
+        return lessonTypeOptions;
     }
 
     public SelectItem[] getExecutedLessonOptions() {
@@ -63,7 +71,7 @@ public class LessonsBean implements Serializable {
         SelectItem[] result = new SelectItem[data.length + 1];
 
 //        result[0] = new SelectItem("", "All");
-         result[0] = new SelectItem("", "Všetky");
+        result[0] = new SelectItem("", "Všetky");
         for (int i = 0; i < data.length; i++) {
             result[i + 1] = new SelectItem(data[i], names[i]);
         }
diff --git a/SkiSchool-war/src/java/org/cvut/skischool/back/SelectBean.java b/SkiSchool-war/src/java/org/cvut/skischool/back/SelectBean.java
index 089de6d..d9232d1 100644
--- a/SkiSchool-war/src/java/org/cvut/skischool/back/SelectBean.java
+++ b/SkiSchool-war/src/java/org/cvut/skischool/back/SelectBean.java
@@ -3,6 +3,7 @@ package org.cvut.skischool.back;
 import java.io.Serializable;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.List;
 import javax.ejb.EJB;
 import javax.faces.application.FacesMessage;
 import javax.faces.bean.ManagedBean;
@@ -80,7 +81,12 @@ public class SelectBean implements Serializable {
     }
 
     public long countIndividualLessons(Instructor instructor) {
-        return lessonManagement.countLessons(instructor, startDate, endDate, NamingConstants.LESSON_INDIVIDUAL);
+        long count = 0;
+        List<Lesson> lessons = lessonManagement.countLessons(instructor, startDate, endDate, NamingConstants.LESSON_INDIVIDUAL);
+        for (Lesson lesson : lessons) {
+            count += DateTools.hoursDifference(lesson.getStartTime(), lesson.getEndTime());
+        }
+        return count;
     }
 
     public long countLessonsLangBonus(Instructor instructor) {
@@ -88,11 +94,21 @@ public class SelectBean implements Serializable {
     }
 
     public long countKindergartenLessons(Instructor instructor) {
-        return lessonManagement.countLessons(instructor, startDate, endDate, NamingConstants.LESSON_KINDERGARTEN);
+        long count = 0;
+        List<Lesson> lessons = lessonManagement.countLessons(instructor, startDate, endDate, NamingConstants.LESSON_KINDERGARTEN);
+        for (Lesson lesson : lessons) {
+            count += DateTools.hoursDifference(lesson.getStartTime(), lesson.getEndTime());
+        }
+        return count;
     }
 
     public long countGroupLessons(Instructor instructor) {
-        return lessonManagement.countLessons(instructor, startDate, endDate, NamingConstants.LESSON_GROUP);
+        long count = 0;
+        List<Lesson> lessons = lessonManagement.countLessons(instructor, startDate, endDate, NamingConstants.LESSON_GROUP);
+        for (Lesson lesson : lessons) {
+            count += DateTools.hoursDifference(lesson.getStartTime(), lesson.getEndTime());
+        }
+        return count;
     }
 
     public long countLessonsTotal(Instructor instructor) {
diff --git a/SkiSchool-war/src/java/org/cvut/skischool/back/StudentsBean.java b/SkiSchool-war/src/java/org/cvut/skischool/back/StudentsBean.java
index b7e7c62..118bcad 100644
--- a/SkiSchool-war/src/java/org/cvut/skischool/back/StudentsBean.java
+++ b/SkiSchool-war/src/java/org/cvut/skischool/back/StudentsBean.java
@@ -7,6 +7,7 @@ import javax.faces.application.FacesMessage;
 import javax.faces.bean.ManagedBean;
 import javax.faces.bean.SessionScoped;
 import javax.faces.context.FacesContext;
+import org.cvut.skischool.Messages;
 import org.cvut.skischool.beans.UserManagementLocal;
 import org.cvut.skischool.model.Student;
 
@@ -59,6 +60,7 @@ public class StudentsBean implements Serializable {
     public void deleteStudent(Student student) {
         if (student.getLessons() == null || student.getLessons().isEmpty()) {
             userManagement.deleteStudent(student);
+            Messages.showInfoMessage("Žiak bol úspešne zmazaný");
         }else{
             showWarnMessage("Žiak nemôže byť zmazaný pretože má hodiny");
 //            showWarnMessage("Student has lessons and can't be deleted");
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 51e1bc5..0b3315e 100644
--- a/SkiSchool-war/src/java/org/cvut/skischool/back/TimetableBean.java
+++ b/SkiSchool-war/src/java/org/cvut/skischool/back/TimetableBean.java
@@ -294,11 +294,11 @@ public class TimetableBean implements Serializable {
             showErrorMessage("Prosím zadajte meno žiaka");
             return;
         }
-        if (newStudent.getFirstName() == null) {
-//            showErrorMessage("Please enter first name and last name");
-            showErrorMessage("Prosím zadajte meno a prezvisko žiaka");
-            return;
-        }
+//        if (newStudent.getFirstName() == null) {
+////            showErrorMessage("Please enter first name and last name");
+//            showErrorMessage("Prosím zadajte meno a prezvisko žiaka");
+//            return;
+//        }
 
         newStudent.setGroupSize(1);
         newStudent.setDisabled(false);
diff --git a/SkiSchool-war/src/java/org/cvut/skischool/translation_en.properties b/SkiSchool-war/src/java/org/cvut/skischool/translation_en.properties
new file mode 100644
index 0000000..f5da674
--- /dev/null
+++ b/SkiSchool-war/src/java/org/cvut/skischool/translation_en.properties
@@ -0,0 +1,125 @@
+global_submit=Create
+global_required=Required
+global_close=Close
+global_remove=Remove
+global_delete=Delete
+global_save=Save
+global_edit=Edit
+
+global_starttime=Start time
+global_endtime=End time
+global_note=Note
+global_notefor=Note
+global_show=Show
+global_set=Set
+
+global_date=Date
+global_time=Time
+global_from=From
+global_to=To
+global_filter=Filter
+
+global_createstudent=Create new student
+
+global_availability=Availability
+global_lessons=Lessons
+global_instructors=Instructors
+global_instructor=Instructor
+global_students=Students
+global_student=Student
+global_ski=Ski
+global_snb=Snowboard
+global_name=Name
+global_age=Age
+
+global_operation=
+
+global_email=Email
+global_phone=Phone
+
+site_usermanagement=User Management
+site_availabilitymanagement=Availability Management
+site_instructorlessons=Instructor lessons
+site_lessons=Lessons
+site_studentlessons=Student lessons
+site_payments=Lessons count
+site_timetable=Timetable
+
+instructor_positionski=Position ski
+instructor_positionsnb=Position snb
+
+student_age=Age
+student_groupsize=Group size
+
+lesson_lessontype=Lesson type
+lesson_lessonpaid=Paid
+lesson_lessonexecuted=Executed
+lesson_standardlessons=Standard lessons
+lesson_grouplessons=Group lessons
+lesson_kindergartenlessons=Kindergarten lessons
+lesson_lessonstotal=Total
+lesson_languagebonus=Language bonus
+lesson_groupsize=Group size
+lesson_equipment=Equipment
+
+timetable_today=today
+timetable_other=other
+timetable_ski=ski
+timetable_snb=snowboard
+timetable_createlesson=Create lesson
+timetable_updatelesson=Update lesson
+timetable_deletelesson=Delete lesson
+
+createinstructor_createInstructor=Create Instructor
+createinstructor_firstName=First Name
+createinstructor_lastName=Last Name
+createinstructor_sex_male=Male
+createinstructor_sex_female=Female
+createinstructor_email=E-mail
+createinstructor_phone=Phone
+createinstructor_address=Address
+createinstructor_sex=Sex
+createinstructor_positionSki=Position ski
+createinstructor_positionSnowboard=Position snowboard
+createinstructor_birthNumber=Birth number
+createinstructor_note=Note
+createinstructor_bankAccount=Bank account
+createinstructor_seasonHours=Season hours
+createinstructor_totalHours=Total hours
+createinstructor_username=Username
+createinstructor_password=Password
+createinstructor_role=Role
+
+createstudent_createStudent=Create Student
+createstudent_age=Age
+createstudent_ski=Ski
+createstudent_snowboard=Snowboard
+createstudent_groupSize=Group size
+
+kindergarten_kindergarten=Kindergarten
+kindergarten_kindergartens=Kindergartens
+kindergarten_instructorsnumber=Number of instructors
+kindergarten_studentsnumber=Number of students
+kindergarten_addinstructors=Add instructors
+kindergarten_addstudents=Add students
+kindergarten_newkindergarten=New Kindergarten
+kindergarten_createkindergarten=Create Kindergarten
+kindergarten_available=Available
+kindergarten_teaching=Teaching
+kindergarten_updateinstructors=Save
+kindergarten_updatestudents=Save
+kindergarten_addstudent=Add student
+kindergarten_studentname=Student name
+
+availability_interval=Set this option for next
+availability_days=days
+availability_wholeday=Whole day
+
+menu_timetable=Timetable
+menu_kindergarten=Kindergarten
+menu_lessons=Lessons
+menu_users=Users
+menu_createinstructor=Create instructor
+menu_createstudent=Create student
+menu_lessonscount=Lessons count
+menu_logout=Sign out
diff --git a/SkiSchool-war/web/WEB-INF/skiSchoolTemplate.xhtml b/SkiSchool-war/web/WEB-INF/skiSchoolTemplate.xhtml
dissimilarity index 88%
index b9eb21d..79202cb 100644
--- a/SkiSchool-war/web/WEB-INF/skiSchoolTemplate.xhtml
+++ b/SkiSchool-war/web/WEB-INF/skiSchoolTemplate.xhtml
@@ -1,71 +1,71 @@
-<?xml version='1.0' encoding='UTF-8' ?> 
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:ui="http://java.sun.com/jsf/facelets"
-      xmlns:h="http://java.sun.com/jsf/html"
-      xmlns:p="http://primefaces.prime.com.tr/ui"
-      xmlns:f="http://java.sun.com/jsf/core">
-
-    <h:head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <link href="./resources/css/cssLayout.css" rel="stylesheet" type="text/css" />
-        <link href="./resources/css/redmond/skin.css" rel="stylesheet" type="text/css" />
-        <title>#{pageTitle}</title>
-    </h:head>
-
-    <h:body>
-
-        <div id="top">
-            <ui:insert name="top">
-                <a href="./timetable.xhtml">
-                    <img src="./resources/images/logo.jpg" alt="SkiSchool IS"/>
-                </a>
-                <p:ajaxStatus styleClass="ajaxStatus">
-                    <f:facet name="start">
-                        <h:graphicImage alt="Loading..." value="./resources/css/redmond/images/ui-anim_basic_16x16.gif"/>
-                    </f:facet>
-                    <f:facet name="complete">
-                        <h:outputText value=""/>
-                    </f:facet>
-                </p:ajaxStatus>
-            </ui:insert>
-        </div>
-        <div>
-            <div id="left">
-                <ui:insert name="left">
-                    <h:form id="menu">
-                        <h:panelGrid columns="1">
-                            <h:link value="#{msgs.menu_timetable}" outcome="timetable" rendered="#{securityBean.inRoleAdministrator}"/>
-                            <h:commandLink action="#{availabilityBean.newAvailability}" value="#{msgs.global_availability}" rendered="#{securityBean.inRoleInstructor}">
-                                <f:setPropertyActionListener value="#{securityBean.currentInstructor}"
-                                                             target="#{availabilityBean.instructor}" />
-                            </h:commandLink>
-                            <h:commandLink action="instructorlessons" value="#{msgs.global_lessons}" rendered="#{securityBean.inRoleInstructor}">
-                                <f:setPropertyActionListener value="#{securityBean.currentInstructor}"
-                                                             target="#{selectBean.instructor}" />
-                            </h:commandLink>
-                            <h:link value="#{msgs.menu_kindergarten}" outcome="kindergarten" rendered="#{securityBean.inRoleAdministrator}"/>
-                            <h:link value="#{msgs.menu_lessons}" outcome="lessons" rendered="#{securityBean.inRoleAdministrator}"/>
-                            <h:link value="#{msgs.menu_users}" outcome="users" rendered="#{securityBean.inRoleAdministrator}"/>
-                            <h:commandLink value="#{msgs.menu_createinstructor}" action="#{instructorsBean.newInstructor}" rendered="#{securityBean.inRoleAdministrator}"/>
-                            <h:commandLink value="#{msgs.menu_createstudent}" action="#{studentsBean.newStudent}" rendered="#{securityBean.inRoleAdministrator}"/>
-                            <h:link value="#{msgs.menu_lessonscount}" outcome="payments" rendered="#{securityBean.inRoleAdministrator}"/>
-                            <h:commandLink value="Môj profil" action="#{instructorsBean.editInstructor(securityBean.currentInstructor)}" rendered="#{securityBean.inRoleInstructor}"/>
-                            <h:commandLink value="#{msgs.menu_logout}" action="#{securityBean.logout}"/>
-                        </h:panelGrid>
-                    </h:form>
-                </ui:insert>
-            </div>
-            <div id="content">
-                <ui:insert name="content">Content</ui:insert>
-            </div>
-        </div>
-        <div id="bottom">
-            <ui:insert name="bottom">
-                &copy; JA-KA SKI 2011 v0.8 <h:outputText value="(#{securityBean.currentUsername})"/>
-            </ui:insert>
-        </div>
-
-    </h:body>
-
-</html>
+<?xml version='1.0' encoding='UTF-8' ?> 
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:h="http://java.sun.com/jsf/html"
+      xmlns:p="http://primefaces.prime.com.tr/ui"
+      xmlns:f="http://java.sun.com/jsf/core">
+    <f:view contentType="text/html">
+        <h:head>
+            <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+            <link href="./resources/css/cssLayout.css" rel="stylesheet" type="text/css" />
+            <link href="./resources/css/redmond/skin.css" rel="stylesheet" type="text/css" />
+            <title>#{pageTitle}</title>
+        </h:head>
+
+        <h:body>
+
+            <div id="top">
+                <ui:insert name="top">
+                    <a href="./index.xhtml">
+                        <img src="./resources/images/logo.jpg" alt="SkiSchool IS"/>
+                    </a>
+                    <p:ajaxStatus styleClass="ajaxStatus">
+                        <f:facet name="start">
+                            <h:graphicImage alt="Loading..." value="./resources/css/redmond/images/ui-anim_basic_16x16.gif"/>
+                        </f:facet>
+                        <f:facet name="complete">
+                            <h:outputText value=""/>
+                        </f:facet>
+                    </p:ajaxStatus>
+                </ui:insert>
+            </div>
+            <div>
+                <div id="left">
+                    <ui:insert name="left">
+                        <h:form id="menu">
+                            <h:panelGrid columns="1">
+                                <h:link value="#{msgs.menu_timetable}" outcome="timetable" rendered="#{securityBean.inRoleAdministrator}"/>
+                                <h:commandLink action="#{availabilityBean.newAvailability}" value="#{msgs.global_availability}" rendered="#{securityBean.inRoleInstructor}">
+                                    <f:setPropertyActionListener value="#{securityBean.currentInstructor}"
+                                                                 target="#{availabilityBean.instructor}" />
+                                </h:commandLink>
+                                <h:commandLink action="instructorlessons" value="#{msgs.global_lessons}" rendered="#{securityBean.inRoleInstructor}">
+                                    <f:setPropertyActionListener value="#{securityBean.currentInstructor}"
+                                                                 target="#{selectBean.instructor}" />
+                                </h:commandLink>
+                                <h:link value="#{msgs.menu_kindergarten}" outcome="kindergarten" rendered="#{securityBean.inRoleAdministrator}"/>
+                                <h:link value="#{msgs.menu_lessons}" outcome="lessons" rendered="#{securityBean.inRoleAdministrator}"/>
+                                <h:link value="#{msgs.menu_users}" outcome="users" rendered="#{securityBean.inRoleAdministrator}"/>
+                                <h:commandLink value="#{msgs.menu_createinstructor}" action="#{instructorsBean.newInstructor}" rendered="#{securityBean.inRoleAdministrator}"/>
+                                <h:commandLink value="#{msgs.menu_createstudent}" action="#{studentsBean.newStudent}" rendered="#{securityBean.inRoleAdministrator}"/>
+                                <h:link value="#{msgs.menu_lessonscount}" outcome="payments" rendered="#{securityBean.inRoleAdministrator}"/>
+                                <h:commandLink value="Môj profil" action="#{instructorsBean.editInstructor(securityBean.currentInstructor)}" rendered="#{securityBean.inRoleInstructor}"/>
+                                <h:commandLink value="#{msgs.menu_logout}" action="#{securityBean.logout}"/>
+                            </h:panelGrid>
+                        </h:form>
+                    </ui:insert>
+                </div>
+                <div id="content">
+                    <ui:insert name="content">Content</ui:insert>
+                </div>
+            </div>
+            <div id="bottom">
+                <ui:insert name="bottom">
+                    &copy; JA-KA SKI 2011 v0.9 <h:outputText value="(#{securityBean.currentUsername})"/>
+                </ui:insert>
+            </div>
+
+        </h:body>
+    </f:view>
+</html>
diff --git a/SkiSchool-war/web/createinstructor.xhtml b/SkiSchool-war/web/createinstructor.xhtml
index 6c05ac4..7ab2c7e 100644
--- a/SkiSchool-war/web/createinstructor.xhtml
+++ b/SkiSchool-war/web/createinstructor.xhtml
@@ -19,7 +19,7 @@
 
                         <p:panel>
                             <h:panelGrid columns="3">
-                                <h:outputLabel value="#{msgs.createinstructor_firstName}*" for="firstName"/>
+                                <h:outputLabel value="#{msgs.createinstructor_firstName}" for="firstName"/>
                                 <h:inputText id="firstName" value="#{instructorsBean.instructor.firstName}" title="FirstName" />
                                 <p:message for="firstName"/>
 
diff --git a/SkiSchool-war/web/createstudent.xhtml b/SkiSchool-war/web/createstudent.xhtml
index fb73955..1b58a95 100644
--- a/SkiSchool-war/web/createstudent.xhtml
+++ b/SkiSchool-war/web/createstudent.xhtml
@@ -12,11 +12,11 @@
             <ui:define name="content">
 
                 <h:form>
-                    <p:panel id="panel" header="#{msgs.createstudent_createStudent}" footer="* #{msgs.global_required}">
+                    <p:panel id="panel" header="#{msgs.createstudent_createStudent}" footer="* #{msgs.global_required}" rendered="#{securityBean.inRoleAdministrator}">
 
                         <p:panel>
                             <h:panelGrid columns="3">
-                                <h:outputLabel value="#{msgs.createinstructor_firstName}*" for="firstName"/>
+                                <h:outputLabel value="#{msgs.createinstructor_firstName}" for="firstName"/>
                                 <h:inputText id="firstName" value="#{studentsBean.student.firstName}" title="FirstName" />
                                 <p:message for="firstName"/>
 
diff --git a/SkiSchool-war/web/instructorlessons.xhtml b/SkiSchool-war/web/instructorlessons.xhtml
index 87770f7..e85ea61 100644
--- a/SkiSchool-war/web/instructorlessons.xhtml
+++ b/SkiSchool-war/web/instructorlessons.xhtml
@@ -8,31 +8,33 @@
     <body>
 
         <ui:composition template="./WEB-INF/skiSchoolTemplate.xhtml">
-            <ui:param name="pageTitle" value="#{msgs.site_instuctorlessons}"/>
+            <ui:param name="pageTitle" value="#{msgs.site_instructorlessons}"/>
             <ui:define name="content">
                 <p:panel>
                     <h:form id="dates">
                         <h:panelGrid columns="2">
                             <h:outputText value="#{msgs.global_from}"/>
                             <p:calendar value="#{selectBean.startDate}"
-                                        pattern="dd. MM. yyyy"
+                                        pattern="dd.MM.yyyy"
                                         timeZone="GMT+1"
-                                        locale="en"/>
+                                        locale="sk"/>
 
                             <h:outputText value="#{msgs.global_to}"/>
                             <p:calendar value="#{selectBean.endDate}"
-                                        pattern="dd. MM. yyyy"
+                                        pattern="dd.MM.yyyy"
                                         timeZone="GMT+1"
-                                        locale="en"/>
+                                        locale="sk"/>
                         </h:panelGrid>
                         <p:messages/>
                         <p:commandButton value="#{msgs.global_filter}" actionListener="#{selectBean.checkDates}" update="dates, lessons"/>
                     </h:form>
                 </p:panel>
 
-                 <h:form id="lessons">
-                     <p:dataTable value="#{selectBean.lessonsByInstructorAndInterval}" var="lesson">
-                        <p:column>
+                <h:form id="lessons">
+                    <p:dataTable value="#{selectBean.lessonsByInstructorAndInterval}" var="lesson">
+                        <p:column filterBy="#{lesson.lessonType}"
+                                  filterOptions="#{lessonsBean.lessonTypeOptions}"
+                                  filterMatchMode="exact">
                             <f:facet name="header">
                                 <h:outputText value="#{msgs.lesson_lessontype}"/>
                             </f:facet>
@@ -89,7 +91,7 @@
                             <f:facet name="header">
                                 <h:outputText value="#{msgs.lesson_lessonpaid}"/>
                             </f:facet>
-                            <h:selectBooleanCheckbox value="#{lesson.paid}"/>
+                            <h:selectBooleanCheckbox value="#{lesson.paid}" disabled="true"/>
                         </p:column>
                         <p:column filterBy="#{lesson.executed}"
                                   filterOptions="#{lessonsBean.executedLessonOptions}"
@@ -97,7 +99,7 @@
                             <f:facet name="header">
                                 <h:outputText value="#{msgs.lesson_lessonexecuted}"/>
                             </f:facet>
-                            <h:selectBooleanCheckbox value="#{lesson.executed}"/>
+                            <h:selectBooleanCheckbox value="#{lesson.executed}" disabled="true"/>
                         </p:column>
                     </p:dataTable>
                 </h:form>
diff --git a/SkiSchool-war/web/kindergarten.xhtml b/SkiSchool-war/web/kindergarten.xhtml
index 74f6a5f..a400295 100644
--- a/SkiSchool-war/web/kindergarten.xhtml
+++ b/SkiSchool-war/web/kindergarten.xhtml
@@ -12,7 +12,7 @@
             <ui:param name="pageTitle" value="#{msgs.kindergarten_kindergarten}" />
             <ui:define name="content">
                 <p:growl id="growl" showDetail="true"/>
-                <h:form id="table" >
+                <h:form id="table" rendered="#{securityBean.inRoleAdministrator}">
                     <p:panel header="#{msgs.kindergarten_kindergartens}">
                         <p:dataTable value="#{kindergartenBean.allKindergartens}"
                                      var="kindergarten">
@@ -73,7 +73,7 @@
                         </p:dataTable>
                     </p:panel>
                 </h:form>
-                <h:form>
+                <h:form rendered="#{securityBean.inRoleAdministrator}">
                     <p:commandButton value="#{msgs.kindergarten_newkindergarten}" action="#{kindergartenBean.newKindergarten}" update="createKindergarten" oncomplete="createKindergartenDialog.show()"/>
                 </h:form>
 
@@ -89,9 +89,9 @@
                                 <p:calendar id="date"
                                             size="15"
                                             value="#{kindergartenBean.date}"
-                                            pattern="dd. MM. yyyy"
+                                            pattern="dd.MM.yyyy"
                                             timeZone="GMT+1"
-                                            locale="en"/>
+                                            locale="sk"/>
                                 <p:message for="date"/>
                             </h:panelGrid>
 
diff --git a/SkiSchool-war/web/lessons.xhtml b/SkiSchool-war/web/lessons.xhtml
index 4759e79..fe09423 100644
--- a/SkiSchool-war/web/lessons.xhtml
+++ b/SkiSchool-war/web/lessons.xhtml
@@ -12,8 +12,10 @@
             <ui:define name="content">
 
                 <h:form id="lessons">
-                    <p:dataTable value="#{lessonsBean.allLessons}" var="lesson">
-                        <p:column>
+                    <p:dataTable value="#{lessonsBean.allLessons}" var="lesson" rendered="#{securityBean.inRoleAdministrator}">
+                        <p:column filterBy="#{lesson.lessonType}"
+                                  filterOptions="#{lessonsBean.lessonTypeOptions}"
+                                  filterMatchMode="exact">
                             <f:facet name="header">
                                 <h:outputText value="#{msgs.lesson_lessontype}"/>
                             </f:facet>
diff --git a/SkiSchool-war/web/payments.xhtml b/SkiSchool-war/web/payments.xhtml
index 32f7d70..d1069fd 100644
--- a/SkiSchool-war/web/payments.xhtml
+++ b/SkiSchool-war/web/payments.xhtml
@@ -12,20 +12,20 @@
             <ui:param name="pageTitle" value="#{msgs.site_payments}" />
             <ui:define name="content">
 
-                <p:panel>
+                <p:panel rendered="#{securityBean.inRoleAdministrator}">
                     <h:form id="dates">
                         <h:panelGrid columns="2">
                             <h:outputText value="#{msgs.global_from}"/>
                             <p:calendar value="#{selectBean.startDate}"
-                                        pattern="dd. MM. yyyy"
+                                        pattern="dd.MM.yyyy"
                                         timeZone="GMT+1"
-                                        locale="en"/>
+                                        locale="sk"/>
 
                             <h:outputText value="#{msgs.global_to}"/>
                             <p:calendar value="#{selectBean.endDate}"
-                                        pattern="dd. MM. yyyy"
+                                        pattern="dd.MM.yyyy"
                                         timeZone="GMT+1"
-                                        locale="en"/>
+                                        locale="sk"/>
                         </h:panelGrid>
                         <p:messages/>
                         <p:commandButton value="#{msgs.global_filter}" actionListener="#{selectBean.checkDates}" update="dates, instructors"/>
@@ -33,7 +33,7 @@
                 </p:panel>
 
                 <h:form id="instructors">
-                    <p:dataTable value="#{instructorsBean.allInstructors}" var="instructor">
+                    <p:dataTable value="#{instructorsBean.allInstructors}" var="instructor" rendered="#{securityBean.inRoleAdministrator}">
                         <p:column>
                             <f:facet name="header">
                                 <h:outputText value="#{msgs.global_instructor}"/>
diff --git a/SkiSchool-war/web/studentlessons.xhtml b/SkiSchool-war/web/studentlessons.xhtml
index d63971c..aab19d1 100644
--- a/SkiSchool-war/web/studentlessons.xhtml
+++ b/SkiSchool-war/web/studentlessons.xhtml
@@ -15,24 +15,26 @@
                         <h:panelGrid columns="2">
                             <h:outputText value="#{msgs.global_from}"/>
                             <p:calendar value="#{selectBean.startDate}"
-                                        pattern="dd. MM. yyyy"
+                                        pattern="dd.MM.yyyy"
                                         timeZone="GMT+1"
-                                        locale="en"/>
+                                        locale="sk"/>
 
                             <h:outputText value="#{msgs.global_to}"/>
                             <p:calendar value="#{selectBean.endDate}"
-                                        pattern="dd. MM. yyyy"
+                                        pattern="dd.MM.yyyy"
                                         timeZone="GMT+1"
-                                        locale="en"/>
+                                        locale="sk"/>
                         </h:panelGrid>
                         <p:messages/>
                         <p:commandButton value="#{msgs.global_filter}" actionListener="#{selectBean.checkDates}" update="dates, lessons"/>
                     </h:form>
                 </p:panel>
 
-                 <h:form id="lessons">
-                     <p:dataTable value="#{selectBean.lessonsByStudentAndInterval}" var="lesson">
-                        <p:column>
+                <h:form id="lessons">
+                    <p:dataTable value="#{selectBean.lessonsByStudentAndInterval}" var="lesson">
+                        <p:column filterBy="#{lesson.lessonType}"
+                                  filterOptions="#{lessonsBean.lessonTypeOptions}"
+                                  filterMatchMode="exact">
                             <f:facet name="header">
                                 <h:outputText value="#{msgs.lesson_lessontype}"/>
                             </f:facet>
@@ -89,7 +91,7 @@
                             <f:facet name="header">
                                 <h:outputText value="#{msgs.lesson_lessonpaid}"/>
                             </f:facet>
-                            <h:selectBooleanCheckbox value="#{lesson.paid}"/>
+                            <h:selectBooleanCheckbox value="#{lesson.paid}" disabled="true"/>
                         </p:column>
                         <p:column filterBy="#{lesson.executed}"
                                   filterOptions="#{lessonsBean.executedLessonOptions}"
@@ -97,7 +99,7 @@
                             <f:facet name="header">
                                 <h:outputText value="#{msgs.lesson_lessonexecuted}"/>
                             </f:facet>
-                            <h:selectBooleanCheckbox value="#{lesson.executed}"/>
+                            <h:selectBooleanCheckbox value="#{lesson.executed}" disabled="true"/>
                         </p:column>
                     </p:dataTable>
                 </h:form>
diff --git a/SkiSchool-war/web/timetable.xhtml b/SkiSchool-war/web/timetable.xhtml
index a8c69d9..bc028d1 100644
--- a/SkiSchool-war/web/timetable.xhtml
+++ b/SkiSchool-war/web/timetable.xhtml
@@ -13,7 +13,7 @@
 
                 <p:growl id="growl" showDetail="true"/>
 
-                <h:form id="calendar">
+                <h:form id="calendar" rendered="#{securityBean.inRoleAdministrator}">
                     <h:panelGrid columns="4">
                         <p:commandLink value="yesterday" actionListener="#{timetableBean.goYesterday}" update="date, timetable" styleClass="ui-icon ui-icon-carat-1-w"/>
                         <h:outputText value="#{timetableBean.date}" id="date">
@@ -25,7 +25,7 @@
                     </h:panelGrid>
                 </h:form>
 
-                <h:form id="timetable">
+                <h:form id="timetable" rendered="#{securityBean.inRoleAdministrator}">
                     <p:dataTable value="#{timetableBean.availableInstructors}" var="instructor">
                         <p:column>
                             <f:facet name="header">
@@ -147,11 +147,30 @@
                             </ui:repeat>
                         </p:column>
                     </p:dataTable>
+                    <p:panel style="margin-top: 10px;margin-right: 600px">
+                        <h:panelGrid columns="2">
+                            <h:outputText style="background-color: #FFA500;padding-left: 50px" value=":"/>
+                            <h:outputText value="#{msgs.lesson_standardlessons}"/>
+                            <h:outputText style="background-color: #FF4500;padding-left: 50px" value=":"/>
+                            <h:outputText value="#{msgs.lesson_kindergartenlessons}"/>
+                            <h:outputText style="background-color:lightgreen ;padding-left: 50px" value=":"/>
+                            <h:outputText value="#{msgs.global_availability}"/>
+                        </h:panelGrid>
+                    </p:panel>
+                    <p:panel style="margin-right: 400px">
+                        <h:panelGrid columns="1">
+                            <h:outputText value="Zmeny:"/>
+                            <h:outputText value="- nie je nutné prvé meno keď sa vytvára nový žiak"/>
+                            <h:outputText value="- zmena počítania hodín"/>
+                            <h:outputText value="- automatické dopĺňanie, nezáleži na veľkosti písmen"/>
+                            <h:outputText value="- inštruktori a žiaci zoradení podľa abecedy"/>
+                            <h:outputText value="- nové filtrovanie v tabuľke hodín"/>
+                            <h:outputText value="- pop up kalendáre po slovensky so začiatkom v pondelok"/>
+                        </h:panelGrid>
+                    </p:panel>
                 </h:form>
 
-                <span class="timebar" style="background-color: #FF4500">Škôlka</span>
-                <span class="timebar" style="background-color: #FFA500">Individuálna</span>
-                <span class="timebar" style="background-color: lightgreen">Dostupnosť</span>
+
 
                 <p:dialog header="#{msgs.timetable_createlesson}"
                           widgetVar="createLessonDialog"
@@ -279,7 +298,7 @@
                                 </h:dataTable>
                             </h:panelGrid>
                         </p:panel>
-                        
+
                         <p:panel>
                             <h:panelGrid columns="2">
                                 <h:outputText value="#{msgs.lesson_lessonexecuted}:"/>
diff --git a/SkiSchool-war/web/users.xhtml b/SkiSchool-war/web/users.xhtml
index 3a0925b..fb63eba 100644
--- a/SkiSchool-war/web/users.xhtml
+++ b/SkiSchool-war/web/users.xhtml
@@ -13,7 +13,7 @@
 
                 <p:growl id="growl" showDetail="true"/>
 
-                <p:tabView>
+                <p:tabView rendered="#{securityBean.inRoleAdministrator}">
                     <p:tab title="#{msgs.global_instructors}">
                         <h:form id="instructors">
                             <p:dataTable value="#{instructorsBean.allInstructors}" var="item">
-- 
2.11.4.GIT