Generate reservations, styles

svn changeset:2529/svn branch:trunk

diff --git a/WebContent/ITMILL/themes/reservr/styles.css b/WebContent/ITMILL/themes/reservr/styles.css
index a2b059a765c2bed0675733bf3e49867f234d0d93..6bf615f486395dae87ec54270014e7abb6cf68b3 100644 (file)
--- a/WebContent/ITMILL/themes/reservr/styles.css
+++ b/WebContent/ITMILL/themes/reservr/styles.css
@@ -64,7 +64,7 @@ textarea.i-textfield {
        background: none;\r
        font-weight: bold;\r
 }\r
-.i-button-selected-link {\r
+#itmtk-ajax-window .i-button-selected-link {\r
        border: 0px;\r
        text-align: left;\r
        text-decoration: none;\r

diff --git a/src/com/itmill/toolkit/demo/reservation/ReservationApplication.java b/src/com/itmill/toolkit/demo/reservation/ReservationApplication.java
index 112d47a46d1a6753e003c9f05555c1f82cf83209..5e6f57abd3f7afe23ab423e7e6ee7a133fd37477 100644 (file)
--- a/src/com/itmill/toolkit/demo/reservation/ReservationApplication.java
+++ b/src/com/itmill/toolkit/demo/reservation/ReservationApplication.java
@@ -50,12 +50,14 @@ public class ReservationApplication extends Application {
                db = new SampleDB(true);\r
                db.generateResources();\r
                db.generateDemoUser();\r
+               db.generateReservations();\r
 \r
                Window mainWindow = new Window("Reservr");\r
                setMainWindow(mainWindow);\r
                setTheme("reservr");\r
 \r
                TabSheet mainTabs = new TabSheet();\r
+               mainTabs.addStyleName(TabSheet.STYLE_NO_PADDING);\r
                mainWindow.addComponent(mainTabs);\r
 \r
                OrderedLayout reservationTab = new OrderedLayout();\r
@@ -70,6 +72,7 @@ public class ReservationApplication extends Application {
 \r
                Panel reservationPanel = new Panel("Reservation", new OrderedLayout(\r
                                OrderedLayout.ORIENTATION_HORIZONTAL));\r
+               reservationPanel.setStyle("light");\r
                reservationTab.addComponent(reservationPanel);\r
 \r
                OrderedLayout infoLayout = new OrderedLayout();\r
@@ -109,7 +112,8 @@ public class ReservationApplication extends Application {
                initCalendarFieldPropertyIds(reservedFrom);\r
                reservationPanel.addComponent(reservedFrom);\r
 \r
-               Label arrowLabel = new Label("»");\r
+               Label arrowLabel = new Label("»");\r
+               arrowLabel.setContentMode(Label.CONTENT_XHTML);\r
                arrowLabel.setStyle("arrow");\r
                reservationPanel.addComponent(arrowLabel);\r
                \r
@@ -166,6 +170,7 @@ public class ReservationApplication extends Application {
                initCalendarFieldPropertyIds(allCalendar);\r
                allLayout.addComponent(allCalendar);\r
                allTable = new Table();\r
+               allTable.setWidth(700);\r
                allTable.setColumnCollapsingAllowed(true);\r
                allTable.setColumnReorderingAllowed(true);\r
                allLayout.addComponent(allTable);\r

diff --git a/src/com/itmill/toolkit/demo/reservation/ResourceSelectorPanel.java b/src/com/itmill/toolkit/demo/reservation/ResourceSelectorPanel.java
index 8593336b4266693751b37cbe53bf95c8287ae30e..69da622ef4983055586332d2fe5664b652c5374d 100644 (file)
--- a/src/com/itmill/toolkit/demo/reservation/ResourceSelectorPanel.java
+++ b/src/com/itmill/toolkit/demo/reservation/ResourceSelectorPanel.java
@@ -22,6 +22,7 @@ public class ResourceSelectorPanel extends Panel implements
 \r
        public ResourceSelectorPanel(String caption) {\r
                super(caption, new OrderedLayout(OrderedLayout.ORIENTATION_HORIZONTAL));\r
+               setStyle("light");\r
        }\r
 \r
        public void setResourceContainer(Container resources) {\r

diff --git a/src/com/itmill/toolkit/demo/reservation/SampleDB.java b/src/com/itmill/toolkit/demo/reservation/SampleDB.java
index cffebc5d716689d8ba618f1b178363148de6bb19..7f2225eee164fcacb7f7fea898c56799a0e9d33f 100644 (file)
--- a/src/com/itmill/toolkit/demo/reservation/SampleDB.java
+++ b/src/com/itmill/toolkit/demo/reservation/SampleDB.java
@@ -6,6 +6,8 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.util.Calendar;
+import java.util.Collection;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
@@ -373,6 +375,47 @@ public class SampleDB {
                }
        }
 
+       public void generateReservations() {
+               int days = 10;
+               String descriptions[] = {
+                               "Picking up guests from airport",
+                               "Sightseeing with the guests",
+                               "Moving new servers from A to B",
+                               "Shopping",
+                               "Customer meeting",
+                               "Guests arriving at harbour",
+                               "Moving furniture",
+                               "Taking guests to see town"     
+               };
+               Container cat = getCategories();
+               Collection cIds = cat.getItemIds();
+               for (Iterator it = cIds.iterator(); it.hasNext();) {
+                       Object id = it.next();
+                       Item ci = cat.getItem(id);
+                       String c = (String)ci.getItemProperty(Resource.PROPERTY_ID_CATEGORY).getValue();
+                       Container resources = getResources(c);
+                       Collection rIds = resources.getItemIds();
+                       Calendar cal = Calendar.getInstance();
+                       //cal.add(Calendar.DAY_OF_MONTH, -days);
+                       for (int i = 0;i<days;i++) {
+                               for (Iterator rit = rIds.iterator();rit.hasNext();) {
+                                       Object rid = rit.next();
+                                       Item resource = resources.getItem(rid);
+                                       int s = 6+(int)Math.round(Math.random() * 10.0);
+                                       int e = s + (int)Math.round(Math.random() * 4.0);
+                                       Date start = new Date(cal.getTimeInMillis());
+                                       start.setHours(s);
+                                       Date end = new Date(cal.getTimeInMillis());
+                                       start.setHours(e);
+                                       addReservation(resource, 0, start, end, descriptions[(int)Math.floor(Math.random()*descriptions.length)]);
+                                       break;
+                               }
+                               cal.add(Calendar.DAY_OF_MONTH, 1);
+                       }
+               }
+               
+       }
+       
        public void generateResources() {
 
                Object[][] resources = {