From: Matti Tahvonen Date: Mon, 21 Apr 2008 07:10:30 +0000 (+0000) Subject: relocated portal example X-Git-Tag: 6.7.0.beta1~4878 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d504096d1ba5ba9460bd29057d1dd7ef6f7d1090;p=vaadin-framework.git relocated portal example svn changeset:4203/svn branch:trunk --- diff --git a/portlet-src/com/itmill/toolkit/demo/reservation/simple/AdminView.java b/portlet-src/com/itmill/toolkit/demo/reservation/simple/AdminView.java new file mode 100644 index 0000000000..5b674b02c7 --- /dev/null +++ b/portlet-src/com/itmill/toolkit/demo/reservation/simple/AdminView.java @@ -0,0 +1,98 @@ +package com.itmill.toolkit.demo.reservation.simple; + +import com.itmill.toolkit.data.Item; +import com.itmill.toolkit.data.Property.ValueChangeEvent; +import com.itmill.toolkit.ui.Button; +import com.itmill.toolkit.ui.ComboBox; +import com.itmill.toolkit.ui.OrderedLayout; +import com.itmill.toolkit.ui.TextField; +import com.itmill.toolkit.ui.AbstractSelect.NewItemHandler; +import com.itmill.toolkit.ui.Button.ClickEvent; +import com.itmill.toolkit.ui.Button.ClickListener; + +public class AdminView extends OrderedLayout { + + private ComboBox resources = new ComboBox( + "Select for editing or type new resource"); + private SimpleReserver application; + private OrderedLayout form = new OrderedLayout(); + private Button save = new Button("Save resource"); + + private TextField name = new TextField("Name:"); + private TextField desc = new TextField("Description:"); + protected Item editedItem; + + AdminView(SimpleReserver app) { + setWidth("280px"); + + application = app; + + resources.setImmediate(true); + resources.setFilteringMode(ComboBox.FILTERINGMODE_CONTAINS); + refreshList(); + resources.setItemCaptionMode(ComboBox.ITEM_CAPTION_MODE_PROPERTY); + resources.setItemCaptionPropertyId(SampleDB.Resource.PROPERTY_ID_NAME); + resources.setNewItemsAllowed(true); + resources.setNewItemHandler(new NewItemHandler() { + public void addNewItem(String newItemCaption) { + name.setValue(newItemCaption); + desc.setValue(""); + form.setVisible(true); + } + }); + + resources.addListener(new ComboBox.ValueChangeListener() { + public void valueChange(ValueChangeEvent event) { + if (resources.getValue() != null) { + editedItem = resources.getItem(resources.getValue()); + + name + .setPropertyDataSource(editedItem + .getItemProperty(SampleDB.Resource.PROPERTY_ID_NAME)); + desc + .setPropertyDataSource(editedItem + .getItemProperty(SampleDB.Resource.PROPERTY_ID_DESCRIPTION)); + + form.setVisible(true); + + } else { + form.setVisible(false); + editedItem = null; + } + + } + }); + addComponent(resources); + + form.setVisible(false); + addComponent(form); + form.addComponent(name); + form.addComponent(desc); + name.setWidth("100%"); + desc.setWidth("100%"); + form.addComponent(save); + save.addListener(new ClickListener() { + public void buttonClick(ClickEvent event) { + if (editedItem == null) { + // save + int addResource = application.getDb().addResource( + name.getValue().toString(), + desc.getValue().toString()); + } else { + // update + application.getDb().updateResource(editedItem, + name.getValue().toString(), + desc.getValue().toString()); + } + resources.setValue(null); + refreshList(); + } + }); + + } + + private void refreshList() { + resources + .setContainerDataSource(application.getDb().getResources(null)); + } +} diff --git a/portlet-src/com/itmill/toolkit/demo/reservation/simple/SampleDB.java b/portlet-src/com/itmill/toolkit/demo/reservation/simple/SampleDB.java new file mode 100644 index 0000000000..6b011e2b67 --- /dev/null +++ b/portlet-src/com/itmill/toolkit/demo/reservation/simple/SampleDB.java @@ -0,0 +1,564 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ + +package com.itmill.toolkit.demo.reservation.simple; + +import java.sql.Connection; +import java.sql.DriverManager; +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; + +import com.itmill.toolkit.data.Container; +import com.itmill.toolkit.data.Item; +import com.itmill.toolkit.data.util.QueryContainer; +import com.itmill.toolkit.demo.reservation.ResourceNotAvailableException; + +/** + * Simplified version of Reservr's SampleDB + * + * If you are going to use this application in production, make sure to modify + * this to save data into real DB instead of in memory HSQLDB. + */ +public class SampleDB { + + public class Resource { + public static final String TABLE = "RESOURCE"; + public static final String PROPERTY_ID_ID = TABLE + "_ID"; + public static final String PROPERTY_ID_STYLENAME = TABLE + "_STYLENAME"; + public static final String PROPERTY_ID_NAME = TABLE + "_NAME"; + public static final String PROPERTY_ID_DESCRIPTION = TABLE + + "_DESCRIPTION"; + public static final String PROPERTY_ID_LOCATIONX = TABLE + + "_LOCATION_X"; + public static final String PROPERTY_ID_LOCATIONY = TABLE + + "_LOCATION_Y"; + public static final String PROPERTY_ID_CATEGORY = TABLE + "_CATEGORY"; + public static final String PROPERTY_ID_DELETED = TABLE + "_DELETED"; + } + + public class Reservation { + public static final String TABLE = "RESERVATION"; + public static final String PROPERTY_ID_ID = TABLE + "_ID"; + public static final String PROPERTY_ID_DESCRIPTION = TABLE + + "_DESCRIPTION"; + public static final String PROPERTY_ID_RESOURCE_ID = TABLE + + "_RESOURCE_ID"; + public static final String PROPERTY_ID_RESERVED_BY = TABLE + + "_RESERVED_BY_USER"; + public static final String PROPERTY_ID_RESERVED_FROM = TABLE + + "_RESERVED_FROM"; + public static final String PROPERTY_ID_RESERVED_TO = TABLE + + "_RESERVED_TO"; + } + + // TODO -> param + private static final String DB_URL = "jdbc:hsqldb:file:reservation.db"; + + private static final String CREATE_TABLE_RESOURCE = "CREATE TABLE " + + Resource.TABLE + " (" + " " + Resource.PROPERTY_ID_ID + + " INTEGER IDENTITY" + ", " + Resource.PROPERTY_ID_STYLENAME + + " VARCHAR(20) NOT NULL" + ", " + Resource.PROPERTY_ID_NAME + + " VARCHAR(30) NOT NULL" + ", " + Resource.PROPERTY_ID_DESCRIPTION + + " VARCHAR(100)" + ", " + Resource.PROPERTY_ID_LOCATIONX + + " DOUBLE" + ", " + Resource.PROPERTY_ID_LOCATIONY + " DOUBLE" + + ", " + Resource.PROPERTY_ID_CATEGORY + " VARCHAR(30)" + ", " + + Resource.PROPERTY_ID_DELETED + " BOOLEAN DEFAULT false NOT NULL" + + ", UNIQUE(" + Resource.PROPERTY_ID_NAME + "))"; + private static final String CREATE_TABLE_RESERVATION = "CREATE TABLE " + + Reservation.TABLE + " (" + " " + Reservation.PROPERTY_ID_ID + + " INTEGER IDENTITY" + ", " + Reservation.PROPERTY_ID_RESOURCE_ID + + " INTEGER" + ", " + Reservation.PROPERTY_ID_RESERVED_FROM + + " TIMESTAMP NOT NULL" + ", " + + Reservation.PROPERTY_ID_RESERVED_TO + " TIMESTAMP NOT NULL" + + ", " + Reservation.PROPERTY_ID_DESCRIPTION + " VARCHAR(100)" + + ", " + Reservation.PROPERTY_ID_RESERVED_BY + " VARCHAR(100)" + + ", FOREIGN KEY (" + Reservation.PROPERTY_ID_RESOURCE_ID + + ") REFERENCES " + Resource.TABLE + "(" + Resource.PROPERTY_ID_ID + + "))"; + + private static Connection connection = null; + + /** + * Create database. + */ + public SampleDB() { + // connect to SQL database + connect(); + + } + + private synchronized void dropTables() { + try { + update("DROP TABLE " + Reservation.TABLE); + } catch (final SQLException IGNORED) { + // IGNORED, assuming it was not there + } + try { + update("DROP TABLE " + Resource.TABLE); + } catch (final SQLException IGNORED) { + // IGNORED, assuming it was not there + } + } + + /** + * Connect to SQL database. In this sample we use HSQLDB and an toolkit + * named database in implicitly created into system memory. + * + */ + private synchronized void connect() { + if (connection == null) { + try { + Class.forName("org.hsqldb.jdbcDriver").newInstance(); + connection = DriverManager.getConnection(DB_URL); + } catch (final Exception e) { + throw new RuntimeException(e); + } + + dropTables(); + // initialize SQL database + createTables(); + + // test by executing sample JDBC query + testDatabase(); + + generateResources(); + generateReservations(); + + } + } + + /** + * use for SQL commands CREATE, DROP, INSERT and UPDATE + * + * @param expression + * @throws SQLException + */ + private synchronized void update(String expression) throws SQLException { + Statement st = null; + st = connection.createStatement(); + final int i = st.executeUpdate(expression); + if (i == -1) { + System.out.println("SampleDatabase error : " + expression); + } + st.close(); + } + + /** + * Create test table and few rows. Issue note: using capitalized column + * names as HSQLDB returns column names in capitalized form with this demo. + * + */ + private synchronized void createTables() { + try { + String stmt = null; + stmt = CREATE_TABLE_RESOURCE; + update(stmt); + } catch (final SQLException e) { + if (e.toString().indexOf("Table already exists") == -1) { + throw new RuntimeException(e); + } + } + try { + String stmt = null; + stmt = CREATE_TABLE_RESERVATION; + update(stmt); + } catch (final SQLException e) { + if (e.toString().indexOf("Table already exists") == -1) { + throw new RuntimeException(e); + } + } + } + + /** + * Test database connection with simple SELECT command. + * + */ + private synchronized String testDatabase() { + String result = null; + try { + final Statement stmt = connection.createStatement( + ResultSet.TYPE_SCROLL_INSENSITIVE, + ResultSet.CONCUR_UPDATABLE); + final ResultSet rs = stmt.executeQuery("SELECT COUNT(*) FROM " + + Resource.TABLE); + rs.next(); + result = "rowcount for table test is " + rs.getObject(1).toString(); + stmt.close(); + } catch (final SQLException e) { + throw new RuntimeException(e); + } + return result; + } + + public Connection getConnection() { + return connection; + } + + public Container getCategories() { + // TODO where deleted=? + final String q = "SELECT DISTINCT(" + Resource.PROPERTY_ID_CATEGORY + + ") FROM " + Resource.TABLE + " ORDER BY " + + Resource.PROPERTY_ID_CATEGORY; + try { + return new QueryContainer(q, connection, + ResultSet.TYPE_SCROLL_INSENSITIVE, + ResultSet.CONCUR_READ_ONLY); + } catch (final SQLException e) { + throw new RuntimeException(e); + } + + } + + public Container getResources(String category) { + // TODO where deleted=? + String q = "SELECT * FROM " + Resource.TABLE; + if (category != null) { + q += " WHERE " + Resource.PROPERTY_ID_CATEGORY + "='" + category + + "'"; // FIXME -> + // PreparedStatement! + } + + try { + return new QueryContainer(q, connection, + ResultSet.TYPE_SCROLL_INSENSITIVE, + ResultSet.CONCUR_READ_ONLY); + } catch (final SQLException e) { + throw new RuntimeException(e); + } + + } + + public Container getReservations(List resources) { + // TODO where reserved_by=? + // TODO where from=? + // TODO where to=? + // TODO where deleted=? + String q = "SELECT * FROM " + Reservation.TABLE + "," + Resource.TABLE; + q += " WHERE " + Reservation.PROPERTY_ID_RESOURCE_ID + "=" + + Resource.PROPERTY_ID_ID; + if (resources != null && resources.size() > 0) { + final StringBuffer s = new StringBuffer(); + for (final Iterator it = resources.iterator(); it.hasNext();) { + if (s.length() > 0) { + s.append(","); + } + s.append(((Item) it.next()) + .getItemProperty(Resource.PROPERTY_ID_ID)); + } + q += " HAVING " + Reservation.PROPERTY_ID_RESOURCE_ID + " IN (" + s + + ")"; + } + q += " ORDER BY " + Reservation.PROPERTY_ID_RESERVED_FROM; + try { + final QueryContainer qc = new QueryContainer(q, connection, + ResultSet.TYPE_SCROLL_INSENSITIVE, + ResultSet.CONCUR_READ_ONLY); + if (qc.size() < 1) { + return null; + } else { + return qc; + } + } catch (final SQLException e) { + throw new RuntimeException(e); + } + } + + public synchronized void addReservation(Item resource, String reservedBy, + Date reservedFrom, Date reservedTo, String description) + throws ResourceNotAvailableException { + if (reservedFrom.after(reservedTo)) { + final Date tmp = reservedTo; + reservedTo = reservedFrom; + reservedFrom = tmp; + } + final int resourceId = ((Integer) resource.getItemProperty( + Resource.PROPERTY_ID_ID).getValue()).intValue(); + final String q = "INSERT INTO " + Reservation.TABLE + " (" + + Reservation.PROPERTY_ID_RESOURCE_ID + "," + + Reservation.PROPERTY_ID_RESERVED_BY + "," + + Reservation.PROPERTY_ID_RESERVED_FROM + "," + + Reservation.PROPERTY_ID_RESERVED_TO + "," + + Reservation.PROPERTY_ID_DESCRIPTION + ")" + + "VALUES (?,?,?,?,?)"; + synchronized (DB_URL) { + if (!isAvailableResource(resourceId, reservedFrom, reservedTo)) { + throw new ResourceNotAvailableException( + "The resource is not available at that time."); + } + try { + PreparedStatement p; + p = connection.prepareStatement(q); + p.setInt(1, resourceId); + p.setString(2, reservedBy); + p.setTimestamp(3, + new java.sql.Timestamp(reservedFrom.getTime())); + p.setTimestamp(4, new java.sql.Timestamp(reservedTo.getTime())); + p.setString(5, description); + p.execute(); + } catch (SQLException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + } + + public boolean isAvailableResource(int resourceId, Date reservedFrom, + Date reservedTo) { + // TODO where deleted=? + if (reservedFrom.after(reservedTo)) { + final Date tmp = reservedTo; + reservedTo = reservedFrom; + reservedFrom = tmp; + } + final String checkQ = "SELECT count(*) FROM " + Reservation.TABLE + + " WHERE " + Reservation.PROPERTY_ID_RESOURCE_ID + "=? AND ((" + + Reservation.PROPERTY_ID_RESERVED_FROM + ">=? AND " + + Reservation.PROPERTY_ID_RESERVED_FROM + "? AND " + + Reservation.PROPERTY_ID_RESERVED_TO + "<=?) OR (" + + Reservation.PROPERTY_ID_RESERVED_FROM + "<=? AND " + + Reservation.PROPERTY_ID_RESERVED_TO + ">=?)" + ")"; + try { + final PreparedStatement p = connection.prepareStatement(checkQ); + p.setInt(1, resourceId); + p.setTimestamp(2, new java.sql.Timestamp(reservedFrom.getTime())); + p.setTimestamp(3, new java.sql.Timestamp(reservedTo.getTime())); + p.setTimestamp(4, new java.sql.Timestamp(reservedFrom.getTime())); + p.setTimestamp(5, new java.sql.Timestamp(reservedTo.getTime())); + p.setTimestamp(6, new java.sql.Timestamp(reservedFrom.getTime())); + p.setTimestamp(7, new java.sql.Timestamp(reservedTo.getTime())); + p.execute(); + final ResultSet rs = p.getResultSet(); + if (rs.next() && rs.getInt(1) > 0) { + return false; + } + } catch (final Exception e) { + throw new RuntimeException(e); + } + return true; + } + + public synchronized void generateReservations() { + final int days = 30; + final 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" }; + final Container cat = getCategories(); + final Collection cIds = cat.getItemIds(); + for (final Iterator it = cIds.iterator(); it.hasNext();) { + final Object id = it.next(); + final Item ci = cat.getItem(id); + final String c = (String) ci.getItemProperty( + Resource.PROPERTY_ID_CATEGORY).getValue(); + final Container resources = getResources(c); + final Collection rIds = resources.getItemIds(); + final Calendar cal = Calendar.getInstance(); + cal.set(Calendar.MINUTE, 0); + cal.set(Calendar.SECOND, 0); + cal.set(Calendar.MILLISECOND, 0); + final int hourNow = new Date().getHours(); + // cal.add(Calendar.DAY_OF_MONTH, -days); + for (int i = 0; i < days; i++) { + int r = 3; + for (final Iterator rit = rIds.iterator(); rit.hasNext() + && r > 0; r--) { + final Object rid = rit.next(); + final Item resource = resources.getItem(rid); + final int s = hourNow - 6 + + (int) Math.round(Math.random() * 6.0); + final int e = s + 1 + (int) Math.round(Math.random() * 4.0); + final Date start = new Date(cal.getTimeInMillis()); + start.setHours(s); + final Date end = new Date(cal.getTimeInMillis()); + end.setHours(e); + try { + addReservation(resource, "Demo User", start, end, + descriptions[(int) Math.floor(Math.random() + * descriptions.length)]); + } catch (ResourceNotAvailableException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } + } + cal.add(Calendar.DATE, 1); + } + } + + } + + public synchronized void generateResources() { + + final Object[][] resources = { + + // TODO change cars to rooms, projectors and other office + // resources + + // Turku + { "01", "01 Ford Mondeo", "w/ company logo", "Turku", + new Double(60.510857), new Double(22.275424) }, + { "02", "02 Citroen Jumper", + "w/ company logo. 12m3 storage space.", "Turku", + new Double(60.452171), new Double(22.2995) }, + { "03", "03 Saab 93", "Cabriolet. Keys from the rental desk.", + "Turku", new Double(60.4507), new Double(22.295551) }, + { "04", "04 Volvo S60", "Key from the rental desk.", "Turku", + new Double(60.434722), new Double(22.224398) }, + { "05", "05 Smart fourtwo", "Cabrio. Keys from infodesk.", + "Turku", new Double(60.508970), new Double(22.264790) }, + // Helsinki + { "06", "06 Smart fourtwo", "Cabrio. Keys from infodesk.", + "Helsinki", new Double(60.17175), new Double(24.939029) }, + { "07", "07 Smart fourtwo", "Cabrio. Keys from infodesk.", + "Helsinki", new Double(60.17175), new Double(24.939029) }, + { "08", "08 Smart fourtwo", "Cabrio. Keys from infodesk.", + "Helsinki", new Double(60.166579), + new Double(24.953899) }, + { "09", "09 Volvo S60", "Keys from infodesk.", "Helsinki", + new Double(60.317832), new Double(24.967289) }, + { "10", "10 Saab 93", "Keys from infodesk.", "Helsinki", + new Double(60.249193), new Double(25.045921) }, + // Silicon Valley + { "11", "11 Ford Mustang", "Keys from Acme clerk.", + "Silicon Valley", new Double(37.615853), + new Double(-122.386384) }, + { "12", "12 Ford Fusion", "Keys from infodesk.", + "Silicon Valley", new Double(37.365028), + new Double(-121.922654) }, + { "13", "13 Land Rover", "Keys from infodesk.", + "Silicon Valley", new Double(37.365028), + new Double(-121.922654) }, + { "14", "14 Land Rover", "Keys from infodesk.", + "Silicon Valley", new Double(37.365028), + new Double(-121.922654) }, + { "15", "15 Ford Mustang", "GT Cal Special. Keys from guard.", + "Silicon Valley", new Double(37.403812), + new Double(-121.977425) }, + { "16", "16 Ford Focus", "Keys from guard.", "Silicon Valley", + new Double(37.403812), new Double(-121.977425) }, + // Paris + { "17", "17 Peugeot 308", "Keys from infodesk.", "Paris", + new Double(48.844756), new Double(2.372784) }, + { "18", "18 Citroen C6", "Keys from rental desk.", "Paris", + new Double(49.007253), new Double(2.545025) }, + { "19", "19 Citroen C6", "Keys from infodesk.", "Paris", + new Double(48.729061), new Double(2.368087) }, + { "20", "20 Peugeot 308", "Keys from ticket sales.", "Paris", + new Double(48.880931), new Double(2.356988) }, + { "21", "21 Peugeot 308", "Keys from ticket sales.", "Paris", + new Double(48.876479), new Double(2.358161) }, + // STHLM + { "22", "22 Volvo S60", "Keys from infodesk.", "Stockholm", + new Double(59.350414), new Double(18.106574) }, + { "23", "23 Saab 93", "Keys from infodesk.", "Stockholm", + new Double(59.355905), new Double(17.946784) }, + { "24", "24 Smart fourtwo", "Keys from infodesk.", "Stockholm", + new Double(59.315939), new Double(18.095904) }, + { "25", "25 Smart fourtwo", "Keys from infodesk.", "Stockholm", + new Double(59.330716), new Double(18.058702) }, + // Boston + /* + * { "26", "26 Ford Mustang", "Keys from infodesk.", "Boston", new + * Double(42.366588), new Double(-71.020955) }, { "27", "27 Smart + * fourtwo", "Keys from infodesk.", "Boston", new Double(42.365419), new + * Double(-71.061748) }, { "28", "28 Volvo S60", "Keys from Seaport + * Hotel reception.", "Boston", new Double(42.34811), new + * Double(-71.041127) }, { "29", "29 Smart fourtwo", "Keys from Seaport + * Hotel reception.", "Boston", new Double(42.348072), new + * Double(-71.041315) }, + */ + + }; + + final String q = "INSERT INTO " + Resource.TABLE + "(" + + Resource.PROPERTY_ID_STYLENAME + "," + + Resource.PROPERTY_ID_NAME + "," + + Resource.PROPERTY_ID_DESCRIPTION + "," + + Resource.PROPERTY_ID_CATEGORY + "," + + Resource.PROPERTY_ID_LOCATIONX + "," + + Resource.PROPERTY_ID_LOCATIONY + ")" + + " VALUES (?,?,?,?,?,?)"; + try { + final PreparedStatement stmt = connection.prepareStatement(q); + for (int i = 0; i < resources.length; i++) { + int j = 0; + stmt.setString(j + 1, (String) resources[i][j++]); + stmt.setString(j + 1, (String) resources[i][j++]); + stmt.setString(j + 1, (String) resources[i][j++]); + stmt.setString(j + 1, (String) resources[i][j++]); + stmt.setDouble(j + 1, ((Double) resources[i][j++]) + .doubleValue()); + stmt.setDouble(j + 1, ((Double) resources[i][j++]) + .doubleValue()); + stmt.execute(); + } + } catch (final SQLException e) { + throw new RuntimeException(e); + } + } + + public int addResource(String name, String desc) { + final String q = "INSERT INTO " + Resource.TABLE + " (" + + Resource.PROPERTY_ID_STYLENAME + "," + + Resource.PROPERTY_ID_NAME + "," + + Resource.PROPERTY_ID_DESCRIPTION + "," + + Resource.PROPERTY_ID_CATEGORY + "," + + Resource.PROPERTY_ID_LOCATIONX + "," + + Resource.PROPERTY_ID_LOCATIONY + ")" + + " VALUES (?,?,?,?,?,?)"; + synchronized (DB_URL) { + try { + PreparedStatement p = connection.prepareStatement(q); + p.setString(1, ""); + p.setString(2, name); + p.setString(3, desc); + p.setString(4, "default"); + p.setDouble(5, 0); + p.setDouble(6, 0); + p.execute(); + + Statement createStatement = connection.createStatement(); + ResultSet executeQuery = createStatement + .executeQuery("CALL IDENTITY()"); + executeQuery.next(); + return executeQuery.getInt(1); + + } catch (SQLException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + return -1; + } + + public void updateResource(Item editedItem, String name, String desc) { + final String q = "UPDATE " + Resource.TABLE + " SET " + + Resource.PROPERTY_ID_NAME + " = ? ," + + Resource.PROPERTY_ID_DESCRIPTION + " = ? " + "WHERE " + + Resource.PROPERTY_ID_ID + " = ?"; + synchronized (DB_URL) { + try { + PreparedStatement p = connection.prepareStatement(q); + p.setString(1, name); + p.setString(2, desc); + p.setInt(3, ((Integer) editedItem.getItemProperty( + Resource.PROPERTY_ID_ID).getValue()).intValue()); + p.execute(); + + } catch (SQLException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + } +} diff --git a/portlet-src/com/itmill/toolkit/demo/reservation/simple/SimpleReserver.java b/portlet-src/com/itmill/toolkit/demo/reservation/simple/SimpleReserver.java new file mode 100644 index 0000000000..d858d2a7e9 --- /dev/null +++ b/portlet-src/com/itmill/toolkit/demo/reservation/simple/SimpleReserver.java @@ -0,0 +1,117 @@ +package com.itmill.toolkit.demo.reservation.simple; + +import javax.portlet.ActionRequest; +import javax.portlet.ActionResponse; +import javax.portlet.PortletMode; +import javax.portlet.PortletSession; +import javax.portlet.RenderRequest; +import javax.portlet.RenderResponse; + +import com.itmill.toolkit.Application; +import com.itmill.toolkit.terminal.gwt.server.PortletApplicationContext; +import com.itmill.toolkit.terminal.gwt.server.PortletApplicationContext.PortletListener; +import com.itmill.toolkit.ui.Button; +import com.itmill.toolkit.ui.OrderedLayout; +import com.itmill.toolkit.ui.Window; +import com.itmill.toolkit.ui.Button.ClickEvent; +import com.itmill.toolkit.ui.Button.ClickListener; + +/** + * This is a stripped down version of Reservr example. Idea is to create simple, + * but actually usable portal gadget. + * + */ +public class SimpleReserver extends Application { + + private SampleDB db = new SampleDB(); + + private StdView stdView = new StdView(this); + + private AdminView adminView = new AdminView(this); + + private Button toggleMode = new Button("Switch mode"); + + private boolean isAdminView = false; + + private boolean isPortlet; + + public void init() { + final Window w = new Window("Simple Reserver"); + w.addStyleName("simplereserver"); + + if (getContext() instanceof PortletApplicationContext) { + isPortlet = true; + PortletApplicationContext context = (PortletApplicationContext) getContext(); + context.addPortletListener(this, new PortletListener() { + public void handleActionRequest(ActionRequest request, + ActionResponse response) { + + } + + public void handleRenderRequest(RenderRequest request, + RenderResponse response) { + // react on mode changes + if ((request.getPortletMode() == PortletMode.EDIT && !isAdminView) + || (request.getPortletMode() == PortletMode.VIEW && isAdminView)) { + toggleMode(); + } + + } + }); + w.setTheme("liferay"); + // portal will deal outer margins + w.getLayout().setMargin(false); + } else { + w.setTheme("reservr"); + } + + setMainWindow(w); + if (!isPortlet) { + // only use toggle mode button when not in portal + w.addComponent(toggleMode); + toggleMode.addListener(new ClickListener() { + public void buttonClick(ClickEvent event) { + toggleMode(); + } + }); + } + w.addComponent(stdView); + } + + protected void toggleMode() { + OrderedLayout main = (OrderedLayout) getMainWindow().getLayout(); + isAdminView = !isAdminView; + if (isAdminView) { + main.replaceComponent(stdView, adminView); + } else { + main.replaceComponent(adminView, stdView); + stdView.refreshData(); + } + } + + public SampleDB getDb() { + return db; + } + + public Object getUser() { + if (getContext() instanceof PortletApplicationContext) { + PortletApplicationContext context = (PortletApplicationContext) getContext(); + Object username = context.getPortletSession().getAttribute( + "userName", PortletSession.APPLICATION_SCOPE); + if (username == null) { + return "Guest Portaluser"; + } + return username.toString(); + + } else { + Object user = super.getUser(); + if (user == null) { + return "Demo User"; + } else { + return user; + } + } + + } + +} diff --git a/portlet-src/com/itmill/toolkit/demo/reservation/simple/StdView.java b/portlet-src/com/itmill/toolkit/demo/reservation/simple/StdView.java new file mode 100644 index 0000000000..d1624f70ac --- /dev/null +++ b/portlet-src/com/itmill/toolkit/demo/reservation/simple/StdView.java @@ -0,0 +1,194 @@ +package com.itmill.toolkit.demo.reservation.simple; + +import java.util.Calendar; +import java.util.Date; +import java.util.LinkedList; +import java.util.List; + +import com.itmill.toolkit.data.Container; +import com.itmill.toolkit.data.Item; +import com.itmill.toolkit.data.Property.ValueChangeEvent; +import com.itmill.toolkit.data.Property.ValueChangeListener; +import com.itmill.toolkit.demo.reservation.CalendarField; +import com.itmill.toolkit.demo.reservation.ResourceNotAvailableException; +import com.itmill.toolkit.ui.Button; +import com.itmill.toolkit.ui.ComboBox; +import com.itmill.toolkit.ui.DateField; +import com.itmill.toolkit.ui.Label; +import com.itmill.toolkit.ui.OrderedLayout; +import com.itmill.toolkit.ui.TextField; +import com.itmill.toolkit.ui.Window; +import com.itmill.toolkit.ui.Button.ClickEvent; +import com.itmill.toolkit.ui.Button.ClickListener; + +public class StdView extends OrderedLayout { + + private ComboBox resources = new ComboBox("Select resource"); + private CalendarField reservations = new CalendarField(); + private Button add = new Button("Add reservation"); + private SimpleReserver application; + + private EditorWindow editor = new EditorWindow(); + + StdView(SimpleReserver app) { + setWidth("280px"); + application = app; + + resources.setImmediate(true); + resources.setFilteringMode(ComboBox.FILTERINGMODE_CONTAINS); + resources + .setContainerDataSource(application.getDb().getResources(null)); + resources.setItemCaptionMode(ComboBox.ITEM_CAPTION_MODE_PROPERTY); + resources.setItemCaptionPropertyId(SampleDB.Resource.PROPERTY_ID_NAME); + resources.addListener(new ComboBox.ValueChangeListener() { + public void valueChange(ValueChangeEvent event) { + refreshReservations(); + } + }); + addComponent(resources); + + initCalendarFieldPropertyIds(reservations); + Calendar c = Calendar.getInstance(); + reservations.setValue(c.getTime()); + reservations.setEnabled(false); + addComponent(reservations); + reservations.setImmediate(true); + + add.setEnabled(false); + addComponent(add); + + add.addListener(new Button.ClickListener() { + public void buttonClick(ClickEvent event) { + if (resources.getValue() != null) { + Item i = resources.getItem(resources.getValue()); + editor.newReservationFor(i); + } + } + }); + + add.setDescription("Add new reservation for selected resource"); + + } + + private static void initCalendarFieldPropertyIds(CalendarField cal) { + cal.setItemStyleNamePropertyId(SampleDB.Resource.PROPERTY_ID_STYLENAME); + cal + .setItemStartPropertyId(SampleDB.Reservation.PROPERTY_ID_RESERVED_FROM); + cal.setItemEndPropertyId(SampleDB.Reservation.PROPERTY_ID_RESERVED_TO); + cal + .setItemTitlePropertyId(SampleDB.Reservation.PROPERTY_ID_RESERVED_BY); + cal + .setItemDescriptionPropertyId(SampleDB.Reservation.PROPERTY_ID_DESCRIPTION); + } + + private void refreshReservations() { + if (resources.getValue() == null) { + reservations.setContainerDataSource(null); + add.setEnabled(false); + reservations.setEnabled(false); + } else { + List resource = new LinkedList(); + resource.add(resources.getItem(resources.getValue())); + final Container res = application.getDb().getReservations(resource); + reservations.setContainerDataSource(res); + add.setEnabled(true); + reservations.setEnabled(true); + } + } + + public class EditorWindow extends Window { + + Label resourceName = new Label(); + + DateField start = new DateField("From:"); + DateField end = new DateField("To:"); + TextField desc = new TextField("Description:"); + Button save = new Button("Save"); + + private Item res; + + private Calendar cal; + + EditorWindow() { + super("Add reservation"); + + cal = Calendar.getInstance(); + + addComponent(resourceName); + + start.setResolution(DateField.RESOLUTION_MIN); + start.setImmediate(true); + start.setValue(new Date()); + start.addListener(new ValueChangeListener() { + public void valueChange(ValueChangeEvent event) { + Date startTime = (Date) start.getValue(); + Date endTime = (Date) end.getValue(); + if (endTime.before(startTime)) { + cal.setTime(startTime); + cal.add(Calendar.HOUR_OF_DAY, 1); + end.setValue(cal.getTime()); + } + } + }); + addComponent(start); + + end.setResolution(DateField.RESOLUTION_MIN); + end.setImmediate(true); + end.setValue(new Date()); + end.addListener(new ValueChangeListener() { + public void valueChange(ValueChangeEvent event) { + Date startTime = (Date) start.getValue(); + Date endTime = (Date) end.getValue(); + if (endTime.before(startTime)) { + cal.setTime(endTime); + cal.add(Calendar.HOUR, -1); + start.setValue(cal.getTime()); + } + } + }); + addComponent(end); + addComponent(desc); + addComponent(save); + save.addListener(new ClickListener() { + public void buttonClick(ClickEvent event) { + try { + application.getDb().addReservation(res, + application.getUser().toString(), + (Date) start.getValue(), (Date) end.getValue(), + (String) desc.getValue()); + EditorWindow.this.close(); + refreshReservations(); + } catch (ResourceNotAvailableException e) { + getWindow() + .showNotification( + "Resource is not available at that time " + + "or is too close to another reservation."); + } + } + }); + } + + public void newReservationFor(Item resource) { + res = resource; + resourceName.setValue("Resourse: " + + res.getItemProperty(SampleDB.Resource.PROPERTY_ID_NAME) + .getValue()); + + cal.setTime((Date) reservations.getValue()); + cal.set(Calendar.MINUTE, 0); + cal.set(Calendar.MILLISECOND, 0); + cal.set(Calendar.SECOND, 0); + start.setValue(cal.getTime()); + cal.add(Calendar.HOUR_OF_DAY, 1); + end.setValue(cal.getTime()); + StdView.this.getWindow().addWindow(this); + } + } + + public void refreshData() { + resources + .setContainerDataSource(application.getDb().getResources(null)); + refreshReservations(); + + } +} diff --git a/src/com/itmill/toolkit/demo/reservation/simple/AdminView.java b/src/com/itmill/toolkit/demo/reservation/simple/AdminView.java deleted file mode 100644 index 5b674b02c7..0000000000 --- a/src/com/itmill/toolkit/demo/reservation/simple/AdminView.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.itmill.toolkit.demo.reservation.simple; - -import com.itmill.toolkit.data.Item; -import com.itmill.toolkit.data.Property.ValueChangeEvent; -import com.itmill.toolkit.ui.Button; -import com.itmill.toolkit.ui.ComboBox; -import com.itmill.toolkit.ui.OrderedLayout; -import com.itmill.toolkit.ui.TextField; -import com.itmill.toolkit.ui.AbstractSelect.NewItemHandler; -import com.itmill.toolkit.ui.Button.ClickEvent; -import com.itmill.toolkit.ui.Button.ClickListener; - -public class AdminView extends OrderedLayout { - - private ComboBox resources = new ComboBox( - "Select for editing or type new resource"); - private SimpleReserver application; - private OrderedLayout form = new OrderedLayout(); - private Button save = new Button("Save resource"); - - private TextField name = new TextField("Name:"); - private TextField desc = new TextField("Description:"); - protected Item editedItem; - - AdminView(SimpleReserver app) { - setWidth("280px"); - - application = app; - - resources.setImmediate(true); - resources.setFilteringMode(ComboBox.FILTERINGMODE_CONTAINS); - refreshList(); - resources.setItemCaptionMode(ComboBox.ITEM_CAPTION_MODE_PROPERTY); - resources.setItemCaptionPropertyId(SampleDB.Resource.PROPERTY_ID_NAME); - resources.setNewItemsAllowed(true); - resources.setNewItemHandler(new NewItemHandler() { - public void addNewItem(String newItemCaption) { - name.setValue(newItemCaption); - desc.setValue(""); - form.setVisible(true); - } - }); - - resources.addListener(new ComboBox.ValueChangeListener() { - public void valueChange(ValueChangeEvent event) { - if (resources.getValue() != null) { - editedItem = resources.getItem(resources.getValue()); - - name - .setPropertyDataSource(editedItem - .getItemProperty(SampleDB.Resource.PROPERTY_ID_NAME)); - desc - .setPropertyDataSource(editedItem - .getItemProperty(SampleDB.Resource.PROPERTY_ID_DESCRIPTION)); - - form.setVisible(true); - - } else { - form.setVisible(false); - editedItem = null; - } - - } - }); - addComponent(resources); - - form.setVisible(false); - addComponent(form); - form.addComponent(name); - form.addComponent(desc); - name.setWidth("100%"); - desc.setWidth("100%"); - form.addComponent(save); - save.addListener(new ClickListener() { - public void buttonClick(ClickEvent event) { - if (editedItem == null) { - // save - int addResource = application.getDb().addResource( - name.getValue().toString(), - desc.getValue().toString()); - } else { - // update - application.getDb().updateResource(editedItem, - name.getValue().toString(), - desc.getValue().toString()); - } - resources.setValue(null); - refreshList(); - } - }); - - } - - private void refreshList() { - resources - .setContainerDataSource(application.getDb().getResources(null)); - } -} diff --git a/src/com/itmill/toolkit/demo/reservation/simple/SampleDB.java b/src/com/itmill/toolkit/demo/reservation/simple/SampleDB.java deleted file mode 100644 index 6b011e2b67..0000000000 --- a/src/com/itmill/toolkit/demo/reservation/simple/SampleDB.java +++ /dev/null @@ -1,564 +0,0 @@ -/* -@ITMillApache2LicenseForJavaFiles@ - */ - -package com.itmill.toolkit.demo.reservation.simple; - -import java.sql.Connection; -import java.sql.DriverManager; -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; - -import com.itmill.toolkit.data.Container; -import com.itmill.toolkit.data.Item; -import com.itmill.toolkit.data.util.QueryContainer; -import com.itmill.toolkit.demo.reservation.ResourceNotAvailableException; - -/** - * Simplified version of Reservr's SampleDB - * - * If you are going to use this application in production, make sure to modify - * this to save data into real DB instead of in memory HSQLDB. - */ -public class SampleDB { - - public class Resource { - public static final String TABLE = "RESOURCE"; - public static final String PROPERTY_ID_ID = TABLE + "_ID"; - public static final String PROPERTY_ID_STYLENAME = TABLE + "_STYLENAME"; - public static final String PROPERTY_ID_NAME = TABLE + "_NAME"; - public static final String PROPERTY_ID_DESCRIPTION = TABLE - + "_DESCRIPTION"; - public static final String PROPERTY_ID_LOCATIONX = TABLE - + "_LOCATION_X"; - public static final String PROPERTY_ID_LOCATIONY = TABLE - + "_LOCATION_Y"; - public static final String PROPERTY_ID_CATEGORY = TABLE + "_CATEGORY"; - public static final String PROPERTY_ID_DELETED = TABLE + "_DELETED"; - } - - public class Reservation { - public static final String TABLE = "RESERVATION"; - public static final String PROPERTY_ID_ID = TABLE + "_ID"; - public static final String PROPERTY_ID_DESCRIPTION = TABLE - + "_DESCRIPTION"; - public static final String PROPERTY_ID_RESOURCE_ID = TABLE - + "_RESOURCE_ID"; - public static final String PROPERTY_ID_RESERVED_BY = TABLE - + "_RESERVED_BY_USER"; - public static final String PROPERTY_ID_RESERVED_FROM = TABLE - + "_RESERVED_FROM"; - public static final String PROPERTY_ID_RESERVED_TO = TABLE - + "_RESERVED_TO"; - } - - // TODO -> param - private static final String DB_URL = "jdbc:hsqldb:file:reservation.db"; - - private static final String CREATE_TABLE_RESOURCE = "CREATE TABLE " - + Resource.TABLE + " (" + " " + Resource.PROPERTY_ID_ID - + " INTEGER IDENTITY" + ", " + Resource.PROPERTY_ID_STYLENAME - + " VARCHAR(20) NOT NULL" + ", " + Resource.PROPERTY_ID_NAME - + " VARCHAR(30) NOT NULL" + ", " + Resource.PROPERTY_ID_DESCRIPTION - + " VARCHAR(100)" + ", " + Resource.PROPERTY_ID_LOCATIONX - + " DOUBLE" + ", " + Resource.PROPERTY_ID_LOCATIONY + " DOUBLE" - + ", " + Resource.PROPERTY_ID_CATEGORY + " VARCHAR(30)" + ", " - + Resource.PROPERTY_ID_DELETED + " BOOLEAN DEFAULT false NOT NULL" - + ", UNIQUE(" + Resource.PROPERTY_ID_NAME + "))"; - private static final String CREATE_TABLE_RESERVATION = "CREATE TABLE " - + Reservation.TABLE + " (" + " " + Reservation.PROPERTY_ID_ID - + " INTEGER IDENTITY" + ", " + Reservation.PROPERTY_ID_RESOURCE_ID - + " INTEGER" + ", " + Reservation.PROPERTY_ID_RESERVED_FROM - + " TIMESTAMP NOT NULL" + ", " - + Reservation.PROPERTY_ID_RESERVED_TO + " TIMESTAMP NOT NULL" - + ", " + Reservation.PROPERTY_ID_DESCRIPTION + " VARCHAR(100)" - + ", " + Reservation.PROPERTY_ID_RESERVED_BY + " VARCHAR(100)" - + ", FOREIGN KEY (" + Reservation.PROPERTY_ID_RESOURCE_ID - + ") REFERENCES " + Resource.TABLE + "(" + Resource.PROPERTY_ID_ID - + "))"; - - private static Connection connection = null; - - /** - * Create database. - */ - public SampleDB() { - // connect to SQL database - connect(); - - } - - private synchronized void dropTables() { - try { - update("DROP TABLE " + Reservation.TABLE); - } catch (final SQLException IGNORED) { - // IGNORED, assuming it was not there - } - try { - update("DROP TABLE " + Resource.TABLE); - } catch (final SQLException IGNORED) { - // IGNORED, assuming it was not there - } - } - - /** - * Connect to SQL database. In this sample we use HSQLDB and an toolkit - * named database in implicitly created into system memory. - * - */ - private synchronized void connect() { - if (connection == null) { - try { - Class.forName("org.hsqldb.jdbcDriver").newInstance(); - connection = DriverManager.getConnection(DB_URL); - } catch (final Exception e) { - throw new RuntimeException(e); - } - - dropTables(); - // initialize SQL database - createTables(); - - // test by executing sample JDBC query - testDatabase(); - - generateResources(); - generateReservations(); - - } - } - - /** - * use for SQL commands CREATE, DROP, INSERT and UPDATE - * - * @param expression - * @throws SQLException - */ - private synchronized void update(String expression) throws SQLException { - Statement st = null; - st = connection.createStatement(); - final int i = st.executeUpdate(expression); - if (i == -1) { - System.out.println("SampleDatabase error : " + expression); - } - st.close(); - } - - /** - * Create test table and few rows. Issue note: using capitalized column - * names as HSQLDB returns column names in capitalized form with this demo. - * - */ - private synchronized void createTables() { - try { - String stmt = null; - stmt = CREATE_TABLE_RESOURCE; - update(stmt); - } catch (final SQLException e) { - if (e.toString().indexOf("Table already exists") == -1) { - throw new RuntimeException(e); - } - } - try { - String stmt = null; - stmt = CREATE_TABLE_RESERVATION; - update(stmt); - } catch (final SQLException e) { - if (e.toString().indexOf("Table already exists") == -1) { - throw new RuntimeException(e); - } - } - } - - /** - * Test database connection with simple SELECT command. - * - */ - private synchronized String testDatabase() { - String result = null; - try { - final Statement stmt = connection.createStatement( - ResultSet.TYPE_SCROLL_INSENSITIVE, - ResultSet.CONCUR_UPDATABLE); - final ResultSet rs = stmt.executeQuery("SELECT COUNT(*) FROM " - + Resource.TABLE); - rs.next(); - result = "rowcount for table test is " + rs.getObject(1).toString(); - stmt.close(); - } catch (final SQLException e) { - throw new RuntimeException(e); - } - return result; - } - - public Connection getConnection() { - return connection; - } - - public Container getCategories() { - // TODO where deleted=? - final String q = "SELECT DISTINCT(" + Resource.PROPERTY_ID_CATEGORY - + ") FROM " + Resource.TABLE + " ORDER BY " - + Resource.PROPERTY_ID_CATEGORY; - try { - return new QueryContainer(q, connection, - ResultSet.TYPE_SCROLL_INSENSITIVE, - ResultSet.CONCUR_READ_ONLY); - } catch (final SQLException e) { - throw new RuntimeException(e); - } - - } - - public Container getResources(String category) { - // TODO where deleted=? - String q = "SELECT * FROM " + Resource.TABLE; - if (category != null) { - q += " WHERE " + Resource.PROPERTY_ID_CATEGORY + "='" + category - + "'"; // FIXME -> - // PreparedStatement! - } - - try { - return new QueryContainer(q, connection, - ResultSet.TYPE_SCROLL_INSENSITIVE, - ResultSet.CONCUR_READ_ONLY); - } catch (final SQLException e) { - throw new RuntimeException(e); - } - - } - - public Container getReservations(List resources) { - // TODO where reserved_by=? - // TODO where from=? - // TODO where to=? - // TODO where deleted=? - String q = "SELECT * FROM " + Reservation.TABLE + "," + Resource.TABLE; - q += " WHERE " + Reservation.PROPERTY_ID_RESOURCE_ID + "=" - + Resource.PROPERTY_ID_ID; - if (resources != null && resources.size() > 0) { - final StringBuffer s = new StringBuffer(); - for (final Iterator it = resources.iterator(); it.hasNext();) { - if (s.length() > 0) { - s.append(","); - } - s.append(((Item) it.next()) - .getItemProperty(Resource.PROPERTY_ID_ID)); - } - q += " HAVING " + Reservation.PROPERTY_ID_RESOURCE_ID + " IN (" + s - + ")"; - } - q += " ORDER BY " + Reservation.PROPERTY_ID_RESERVED_FROM; - try { - final QueryContainer qc = new QueryContainer(q, connection, - ResultSet.TYPE_SCROLL_INSENSITIVE, - ResultSet.CONCUR_READ_ONLY); - if (qc.size() < 1) { - return null; - } else { - return qc; - } - } catch (final SQLException e) { - throw new RuntimeException(e); - } - } - - public synchronized void addReservation(Item resource, String reservedBy, - Date reservedFrom, Date reservedTo, String description) - throws ResourceNotAvailableException { - if (reservedFrom.after(reservedTo)) { - final Date tmp = reservedTo; - reservedTo = reservedFrom; - reservedFrom = tmp; - } - final int resourceId = ((Integer) resource.getItemProperty( - Resource.PROPERTY_ID_ID).getValue()).intValue(); - final String q = "INSERT INTO " + Reservation.TABLE + " (" - + Reservation.PROPERTY_ID_RESOURCE_ID + "," - + Reservation.PROPERTY_ID_RESERVED_BY + "," - + Reservation.PROPERTY_ID_RESERVED_FROM + "," - + Reservation.PROPERTY_ID_RESERVED_TO + "," - + Reservation.PROPERTY_ID_DESCRIPTION + ")" - + "VALUES (?,?,?,?,?)"; - synchronized (DB_URL) { - if (!isAvailableResource(resourceId, reservedFrom, reservedTo)) { - throw new ResourceNotAvailableException( - "The resource is not available at that time."); - } - try { - PreparedStatement p; - p = connection.prepareStatement(q); - p.setInt(1, resourceId); - p.setString(2, reservedBy); - p.setTimestamp(3, - new java.sql.Timestamp(reservedFrom.getTime())); - p.setTimestamp(4, new java.sql.Timestamp(reservedTo.getTime())); - p.setString(5, description); - p.execute(); - } catch (SQLException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - } - - public boolean isAvailableResource(int resourceId, Date reservedFrom, - Date reservedTo) { - // TODO where deleted=? - if (reservedFrom.after(reservedTo)) { - final Date tmp = reservedTo; - reservedTo = reservedFrom; - reservedFrom = tmp; - } - final String checkQ = "SELECT count(*) FROM " + Reservation.TABLE - + " WHERE " + Reservation.PROPERTY_ID_RESOURCE_ID + "=? AND ((" - + Reservation.PROPERTY_ID_RESERVED_FROM + ">=? AND " - + Reservation.PROPERTY_ID_RESERVED_FROM + "? AND " - + Reservation.PROPERTY_ID_RESERVED_TO + "<=?) OR (" - + Reservation.PROPERTY_ID_RESERVED_FROM + "<=? AND " - + Reservation.PROPERTY_ID_RESERVED_TO + ">=?)" + ")"; - try { - final PreparedStatement p = connection.prepareStatement(checkQ); - p.setInt(1, resourceId); - p.setTimestamp(2, new java.sql.Timestamp(reservedFrom.getTime())); - p.setTimestamp(3, new java.sql.Timestamp(reservedTo.getTime())); - p.setTimestamp(4, new java.sql.Timestamp(reservedFrom.getTime())); - p.setTimestamp(5, new java.sql.Timestamp(reservedTo.getTime())); - p.setTimestamp(6, new java.sql.Timestamp(reservedFrom.getTime())); - p.setTimestamp(7, new java.sql.Timestamp(reservedTo.getTime())); - p.execute(); - final ResultSet rs = p.getResultSet(); - if (rs.next() && rs.getInt(1) > 0) { - return false; - } - } catch (final Exception e) { - throw new RuntimeException(e); - } - return true; - } - - public synchronized void generateReservations() { - final int days = 30; - final 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" }; - final Container cat = getCategories(); - final Collection cIds = cat.getItemIds(); - for (final Iterator it = cIds.iterator(); it.hasNext();) { - final Object id = it.next(); - final Item ci = cat.getItem(id); - final String c = (String) ci.getItemProperty( - Resource.PROPERTY_ID_CATEGORY).getValue(); - final Container resources = getResources(c); - final Collection rIds = resources.getItemIds(); - final Calendar cal = Calendar.getInstance(); - cal.set(Calendar.MINUTE, 0); - cal.set(Calendar.SECOND, 0); - cal.set(Calendar.MILLISECOND, 0); - final int hourNow = new Date().getHours(); - // cal.add(Calendar.DAY_OF_MONTH, -days); - for (int i = 0; i < days; i++) { - int r = 3; - for (final Iterator rit = rIds.iterator(); rit.hasNext() - && r > 0; r--) { - final Object rid = rit.next(); - final Item resource = resources.getItem(rid); - final int s = hourNow - 6 - + (int) Math.round(Math.random() * 6.0); - final int e = s + 1 + (int) Math.round(Math.random() * 4.0); - final Date start = new Date(cal.getTimeInMillis()); - start.setHours(s); - final Date end = new Date(cal.getTimeInMillis()); - end.setHours(e); - try { - addReservation(resource, "Demo User", start, end, - descriptions[(int) Math.floor(Math.random() - * descriptions.length)]); - } catch (ResourceNotAvailableException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - } - cal.add(Calendar.DATE, 1); - } - } - - } - - public synchronized void generateResources() { - - final Object[][] resources = { - - // TODO change cars to rooms, projectors and other office - // resources - - // Turku - { "01", "01 Ford Mondeo", "w/ company logo", "Turku", - new Double(60.510857), new Double(22.275424) }, - { "02", "02 Citroen Jumper", - "w/ company logo. 12m3 storage space.", "Turku", - new Double(60.452171), new Double(22.2995) }, - { "03", "03 Saab 93", "Cabriolet. Keys from the rental desk.", - "Turku", new Double(60.4507), new Double(22.295551) }, - { "04", "04 Volvo S60", "Key from the rental desk.", "Turku", - new Double(60.434722), new Double(22.224398) }, - { "05", "05 Smart fourtwo", "Cabrio. Keys from infodesk.", - "Turku", new Double(60.508970), new Double(22.264790) }, - // Helsinki - { "06", "06 Smart fourtwo", "Cabrio. Keys from infodesk.", - "Helsinki", new Double(60.17175), new Double(24.939029) }, - { "07", "07 Smart fourtwo", "Cabrio. Keys from infodesk.", - "Helsinki", new Double(60.17175), new Double(24.939029) }, - { "08", "08 Smart fourtwo", "Cabrio. Keys from infodesk.", - "Helsinki", new Double(60.166579), - new Double(24.953899) }, - { "09", "09 Volvo S60", "Keys from infodesk.", "Helsinki", - new Double(60.317832), new Double(24.967289) }, - { "10", "10 Saab 93", "Keys from infodesk.", "Helsinki", - new Double(60.249193), new Double(25.045921) }, - // Silicon Valley - { "11", "11 Ford Mustang", "Keys from Acme clerk.", - "Silicon Valley", new Double(37.615853), - new Double(-122.386384) }, - { "12", "12 Ford Fusion", "Keys from infodesk.", - "Silicon Valley", new Double(37.365028), - new Double(-121.922654) }, - { "13", "13 Land Rover", "Keys from infodesk.", - "Silicon Valley", new Double(37.365028), - new Double(-121.922654) }, - { "14", "14 Land Rover", "Keys from infodesk.", - "Silicon Valley", new Double(37.365028), - new Double(-121.922654) }, - { "15", "15 Ford Mustang", "GT Cal Special. Keys from guard.", - "Silicon Valley", new Double(37.403812), - new Double(-121.977425) }, - { "16", "16 Ford Focus", "Keys from guard.", "Silicon Valley", - new Double(37.403812), new Double(-121.977425) }, - // Paris - { "17", "17 Peugeot 308", "Keys from infodesk.", "Paris", - new Double(48.844756), new Double(2.372784) }, - { "18", "18 Citroen C6", "Keys from rental desk.", "Paris", - new Double(49.007253), new Double(2.545025) }, - { "19", "19 Citroen C6", "Keys from infodesk.", "Paris", - new Double(48.729061), new Double(2.368087) }, - { "20", "20 Peugeot 308", "Keys from ticket sales.", "Paris", - new Double(48.880931), new Double(2.356988) }, - { "21", "21 Peugeot 308", "Keys from ticket sales.", "Paris", - new Double(48.876479), new Double(2.358161) }, - // STHLM - { "22", "22 Volvo S60", "Keys from infodesk.", "Stockholm", - new Double(59.350414), new Double(18.106574) }, - { "23", "23 Saab 93", "Keys from infodesk.", "Stockholm", - new Double(59.355905), new Double(17.946784) }, - { "24", "24 Smart fourtwo", "Keys from infodesk.", "Stockholm", - new Double(59.315939), new Double(18.095904) }, - { "25", "25 Smart fourtwo", "Keys from infodesk.", "Stockholm", - new Double(59.330716), new Double(18.058702) }, - // Boston - /* - * { "26", "26 Ford Mustang", "Keys from infodesk.", "Boston", new - * Double(42.366588), new Double(-71.020955) }, { "27", "27 Smart - * fourtwo", "Keys from infodesk.", "Boston", new Double(42.365419), new - * Double(-71.061748) }, { "28", "28 Volvo S60", "Keys from Seaport - * Hotel reception.", "Boston", new Double(42.34811), new - * Double(-71.041127) }, { "29", "29 Smart fourtwo", "Keys from Seaport - * Hotel reception.", "Boston", new Double(42.348072), new - * Double(-71.041315) }, - */ - - }; - - final String q = "INSERT INTO " + Resource.TABLE + "(" - + Resource.PROPERTY_ID_STYLENAME + "," - + Resource.PROPERTY_ID_NAME + "," - + Resource.PROPERTY_ID_DESCRIPTION + "," - + Resource.PROPERTY_ID_CATEGORY + "," - + Resource.PROPERTY_ID_LOCATIONX + "," - + Resource.PROPERTY_ID_LOCATIONY + ")" - + " VALUES (?,?,?,?,?,?)"; - try { - final PreparedStatement stmt = connection.prepareStatement(q); - for (int i = 0; i < resources.length; i++) { - int j = 0; - stmt.setString(j + 1, (String) resources[i][j++]); - stmt.setString(j + 1, (String) resources[i][j++]); - stmt.setString(j + 1, (String) resources[i][j++]); - stmt.setString(j + 1, (String) resources[i][j++]); - stmt.setDouble(j + 1, ((Double) resources[i][j++]) - .doubleValue()); - stmt.setDouble(j + 1, ((Double) resources[i][j++]) - .doubleValue()); - stmt.execute(); - } - } catch (final SQLException e) { - throw new RuntimeException(e); - } - } - - public int addResource(String name, String desc) { - final String q = "INSERT INTO " + Resource.TABLE + " (" - + Resource.PROPERTY_ID_STYLENAME + "," - + Resource.PROPERTY_ID_NAME + "," - + Resource.PROPERTY_ID_DESCRIPTION + "," - + Resource.PROPERTY_ID_CATEGORY + "," - + Resource.PROPERTY_ID_LOCATIONX + "," - + Resource.PROPERTY_ID_LOCATIONY + ")" - + " VALUES (?,?,?,?,?,?)"; - synchronized (DB_URL) { - try { - PreparedStatement p = connection.prepareStatement(q); - p.setString(1, ""); - p.setString(2, name); - p.setString(3, desc); - p.setString(4, "default"); - p.setDouble(5, 0); - p.setDouble(6, 0); - p.execute(); - - Statement createStatement = connection.createStatement(); - ResultSet executeQuery = createStatement - .executeQuery("CALL IDENTITY()"); - executeQuery.next(); - return executeQuery.getInt(1); - - } catch (SQLException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - return -1; - } - - public void updateResource(Item editedItem, String name, String desc) { - final String q = "UPDATE " + Resource.TABLE + " SET " - + Resource.PROPERTY_ID_NAME + " = ? ," - + Resource.PROPERTY_ID_DESCRIPTION + " = ? " + "WHERE " - + Resource.PROPERTY_ID_ID + " = ?"; - synchronized (DB_URL) { - try { - PreparedStatement p = connection.prepareStatement(q); - p.setString(1, name); - p.setString(2, desc); - p.setInt(3, ((Integer) editedItem.getItemProperty( - Resource.PROPERTY_ID_ID).getValue()).intValue()); - p.execute(); - - } catch (SQLException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - - } -} diff --git a/src/com/itmill/toolkit/demo/reservation/simple/SimpleReserver.java b/src/com/itmill/toolkit/demo/reservation/simple/SimpleReserver.java deleted file mode 100644 index d858d2a7e9..0000000000 --- a/src/com/itmill/toolkit/demo/reservation/simple/SimpleReserver.java +++ /dev/null @@ -1,117 +0,0 @@ -package com.itmill.toolkit.demo.reservation.simple; - -import javax.portlet.ActionRequest; -import javax.portlet.ActionResponse; -import javax.portlet.PortletMode; -import javax.portlet.PortletSession; -import javax.portlet.RenderRequest; -import javax.portlet.RenderResponse; - -import com.itmill.toolkit.Application; -import com.itmill.toolkit.terminal.gwt.server.PortletApplicationContext; -import com.itmill.toolkit.terminal.gwt.server.PortletApplicationContext.PortletListener; -import com.itmill.toolkit.ui.Button; -import com.itmill.toolkit.ui.OrderedLayout; -import com.itmill.toolkit.ui.Window; -import com.itmill.toolkit.ui.Button.ClickEvent; -import com.itmill.toolkit.ui.Button.ClickListener; - -/** - * This is a stripped down version of Reservr example. Idea is to create simple, - * but actually usable portal gadget. - * - */ -public class SimpleReserver extends Application { - - private SampleDB db = new SampleDB(); - - private StdView stdView = new StdView(this); - - private AdminView adminView = new AdminView(this); - - private Button toggleMode = new Button("Switch mode"); - - private boolean isAdminView = false; - - private boolean isPortlet; - - public void init() { - final Window w = new Window("Simple Reserver"); - w.addStyleName("simplereserver"); - - if (getContext() instanceof PortletApplicationContext) { - isPortlet = true; - PortletApplicationContext context = (PortletApplicationContext) getContext(); - context.addPortletListener(this, new PortletListener() { - public void handleActionRequest(ActionRequest request, - ActionResponse response) { - - } - - public void handleRenderRequest(RenderRequest request, - RenderResponse response) { - // react on mode changes - if ((request.getPortletMode() == PortletMode.EDIT && !isAdminView) - || (request.getPortletMode() == PortletMode.VIEW && isAdminView)) { - toggleMode(); - } - - } - }); - w.setTheme("liferay"); - // portal will deal outer margins - w.getLayout().setMargin(false); - } else { - w.setTheme("reservr"); - } - - setMainWindow(w); - if (!isPortlet) { - // only use toggle mode button when not in portal - w.addComponent(toggleMode); - toggleMode.addListener(new ClickListener() { - public void buttonClick(ClickEvent event) { - toggleMode(); - } - }); - } - w.addComponent(stdView); - } - - protected void toggleMode() { - OrderedLayout main = (OrderedLayout) getMainWindow().getLayout(); - isAdminView = !isAdminView; - if (isAdminView) { - main.replaceComponent(stdView, adminView); - } else { - main.replaceComponent(adminView, stdView); - stdView.refreshData(); - } - } - - public SampleDB getDb() { - return db; - } - - public Object getUser() { - if (getContext() instanceof PortletApplicationContext) { - PortletApplicationContext context = (PortletApplicationContext) getContext(); - Object username = context.getPortletSession().getAttribute( - "userName", PortletSession.APPLICATION_SCOPE); - if (username == null) { - return "Guest Portaluser"; - } - return username.toString(); - - } else { - Object user = super.getUser(); - if (user == null) { - return "Demo User"; - } else { - return user; - } - } - - } - -} diff --git a/src/com/itmill/toolkit/demo/reservation/simple/StdView.java b/src/com/itmill/toolkit/demo/reservation/simple/StdView.java deleted file mode 100644 index d1624f70ac..0000000000 --- a/src/com/itmill/toolkit/demo/reservation/simple/StdView.java +++ /dev/null @@ -1,194 +0,0 @@ -package com.itmill.toolkit.demo.reservation.simple; - -import java.util.Calendar; -import java.util.Date; -import java.util.LinkedList; -import java.util.List; - -import com.itmill.toolkit.data.Container; -import com.itmill.toolkit.data.Item; -import com.itmill.toolkit.data.Property.ValueChangeEvent; -import com.itmill.toolkit.data.Property.ValueChangeListener; -import com.itmill.toolkit.demo.reservation.CalendarField; -import com.itmill.toolkit.demo.reservation.ResourceNotAvailableException; -import com.itmill.toolkit.ui.Button; -import com.itmill.toolkit.ui.ComboBox; -import com.itmill.toolkit.ui.DateField; -import com.itmill.toolkit.ui.Label; -import com.itmill.toolkit.ui.OrderedLayout; -import com.itmill.toolkit.ui.TextField; -import com.itmill.toolkit.ui.Window; -import com.itmill.toolkit.ui.Button.ClickEvent; -import com.itmill.toolkit.ui.Button.ClickListener; - -public class StdView extends OrderedLayout { - - private ComboBox resources = new ComboBox("Select resource"); - private CalendarField reservations = new CalendarField(); - private Button add = new Button("Add reservation"); - private SimpleReserver application; - - private EditorWindow editor = new EditorWindow(); - - StdView(SimpleReserver app) { - setWidth("280px"); - application = app; - - resources.setImmediate(true); - resources.setFilteringMode(ComboBox.FILTERINGMODE_CONTAINS); - resources - .setContainerDataSource(application.getDb().getResources(null)); - resources.setItemCaptionMode(ComboBox.ITEM_CAPTION_MODE_PROPERTY); - resources.setItemCaptionPropertyId(SampleDB.Resource.PROPERTY_ID_NAME); - resources.addListener(new ComboBox.ValueChangeListener() { - public void valueChange(ValueChangeEvent event) { - refreshReservations(); - } - }); - addComponent(resources); - - initCalendarFieldPropertyIds(reservations); - Calendar c = Calendar.getInstance(); - reservations.setValue(c.getTime()); - reservations.setEnabled(false); - addComponent(reservations); - reservations.setImmediate(true); - - add.setEnabled(false); - addComponent(add); - - add.addListener(new Button.ClickListener() { - public void buttonClick(ClickEvent event) { - if (resources.getValue() != null) { - Item i = resources.getItem(resources.getValue()); - editor.newReservationFor(i); - } - } - }); - - add.setDescription("Add new reservation for selected resource"); - - } - - private static void initCalendarFieldPropertyIds(CalendarField cal) { - cal.setItemStyleNamePropertyId(SampleDB.Resource.PROPERTY_ID_STYLENAME); - cal - .setItemStartPropertyId(SampleDB.Reservation.PROPERTY_ID_RESERVED_FROM); - cal.setItemEndPropertyId(SampleDB.Reservation.PROPERTY_ID_RESERVED_TO); - cal - .setItemTitlePropertyId(SampleDB.Reservation.PROPERTY_ID_RESERVED_BY); - cal - .setItemDescriptionPropertyId(SampleDB.Reservation.PROPERTY_ID_DESCRIPTION); - } - - private void refreshReservations() { - if (resources.getValue() == null) { - reservations.setContainerDataSource(null); - add.setEnabled(false); - reservations.setEnabled(false); - } else { - List resource = new LinkedList(); - resource.add(resources.getItem(resources.getValue())); - final Container res = application.getDb().getReservations(resource); - reservations.setContainerDataSource(res); - add.setEnabled(true); - reservations.setEnabled(true); - } - } - - public class EditorWindow extends Window { - - Label resourceName = new Label(); - - DateField start = new DateField("From:"); - DateField end = new DateField("To:"); - TextField desc = new TextField("Description:"); - Button save = new Button("Save"); - - private Item res; - - private Calendar cal; - - EditorWindow() { - super("Add reservation"); - - cal = Calendar.getInstance(); - - addComponent(resourceName); - - start.setResolution(DateField.RESOLUTION_MIN); - start.setImmediate(true); - start.setValue(new Date()); - start.addListener(new ValueChangeListener() { - public void valueChange(ValueChangeEvent event) { - Date startTime = (Date) start.getValue(); - Date endTime = (Date) end.getValue(); - if (endTime.before(startTime)) { - cal.setTime(startTime); - cal.add(Calendar.HOUR_OF_DAY, 1); - end.setValue(cal.getTime()); - } - } - }); - addComponent(start); - - end.setResolution(DateField.RESOLUTION_MIN); - end.setImmediate(true); - end.setValue(new Date()); - end.addListener(new ValueChangeListener() { - public void valueChange(ValueChangeEvent event) { - Date startTime = (Date) start.getValue(); - Date endTime = (Date) end.getValue(); - if (endTime.before(startTime)) { - cal.setTime(endTime); - cal.add(Calendar.HOUR, -1); - start.setValue(cal.getTime()); - } - } - }); - addComponent(end); - addComponent(desc); - addComponent(save); - save.addListener(new ClickListener() { - public void buttonClick(ClickEvent event) { - try { - application.getDb().addReservation(res, - application.getUser().toString(), - (Date) start.getValue(), (Date) end.getValue(), - (String) desc.getValue()); - EditorWindow.this.close(); - refreshReservations(); - } catch (ResourceNotAvailableException e) { - getWindow() - .showNotification( - "Resource is not available at that time " - + "or is too close to another reservation."); - } - } - }); - } - - public void newReservationFor(Item resource) { - res = resource; - resourceName.setValue("Resourse: " - + res.getItemProperty(SampleDB.Resource.PROPERTY_ID_NAME) - .getValue()); - - cal.setTime((Date) reservations.getValue()); - cal.set(Calendar.MINUTE, 0); - cal.set(Calendar.MILLISECOND, 0); - cal.set(Calendar.SECOND, 0); - start.setValue(cal.getTime()); - cal.add(Calendar.HOUR_OF_DAY, 1); - end.setValue(cal.getTime()); - StdView.this.getWindow().addWindow(this); - } - } - - public void refreshData() { - resources - .setContainerDataSource(application.getDb().getResources(null)); - refreshReservations(); - - } -}