1.1 --- a/src/main/java/ru/indvdum/mywork/vaadin/MyWorkApplication.java	Tue Aug 16 15:54:50 2011 +0300
     1.2 +++ b/src/main/java/ru/indvdum/mywork/vaadin/MyWorkApplication.java	Wed Aug 17 17:03:37 2011 +0300
     1.3 @@ -35,15 +35,12 @@
     1.4  		Window window = new Window();
     1.5  		setMainWindow(window);
     1.6  		
     1.7 -		Query query = EM.createQuery("select x from " + Work.class.getName() + " x");
     1.8 -		List list = query.getResultList();
     1.9 -		list.size();
    1.10 -		
    1.11  		TabSheet tabSheet = new TabSheet();
    1.12  		tabSheet.setSizeFull();
    1.13  		window.setContent(tabSheet);
    1.14  		
    1.15  		VerticalLayout vlMain = new VerticalLayout();
    1.16 +		vlMain.setSizeFull();
    1.17  		vlMain.setMargin(true);
    1.18  		vlMain.setSpacing(true);
    1.19  		tabSheet.addTab(vlMain, "Main page", null);
    1.20 @@ -53,12 +50,18 @@
    1.21  		JPAContainer<Day> dayContainer = new JPAContainer(Day.class);
    1.22  		dayContainer.setEntityProvider(dayProvider);
    1.23  		
    1.24 -		final Table dayTable = new Table();
    1.25 +		Table dayTable = new Table();
    1.26  		dayTable.setSelectable(true);
    1.27  		dayTable.setEditable(false);
    1.28  		dayTable.setImmediate(true);
    1.29  		dayTable.setSizeFull();
    1.30  		dayTable.setContainerDataSource(dayContainer);
    1.31 +		dayTable.setVisibleColumns(new String[]{
    1.32 +				"day",
    1.33 +				"startWork",
    1.34 +				"endWork",
    1.35 +				"hours",
    1.36 +		});
    1.37  		vlMain.addComponent(dayTable);
    1.38  		vlMain.setExpandRatio(dayTable, 1f);
    1.39  		
    1.40 @@ -73,7 +76,33 @@
    1.41  		taskTable.setImmediate(true);
    1.42  		taskTable.setSizeFull();
    1.43  		taskTable.setContainerDataSource(taskContainer);
    1.44 +		taskTable.setVisibleColumns(new String[]{
    1.45 +				"name",
    1.46 +				"description",
    1.47 +		});
    1.48 +		taskTable.setColumnWidth("description", 300);
    1.49  		vlMain.addComponent(taskTable);
    1.50  		vlMain.setExpandRatio(taskTable, 1f);
    1.51 +		
    1.52 +		LocalEntityProvider workProvider = new LocalEntityProvider(Work.class);
    1.53 +		workProvider.setEntityManager(EM);
    1.54 +		JPAContainer<Task> workContainer = new JPAContainer(Work.class);
    1.55 +		workContainer.setEntityProvider(workProvider);
    1.56 +		
    1.57 +		Table workTable = new Table();
    1.58 +		workTable.setSelectable(true);
    1.59 +		workTable.setEditable(false);
    1.60 +		workTable.setImmediate(true);
    1.61 +		workTable.setSizeFull();
    1.62 +		workTable.setContainerDataSource(workContainer);
    1.63 +		workTable.setVisibleColumns(new String[]{
    1.64 +				"dayName",
    1.65 +				"taskName",
    1.66 +				"hours",
    1.67 +				"result",
    1.68 +		});
    1.69 +		workTable.setColumnWidth("result", 200);
    1.70 +		vlMain.addComponent(workTable);
    1.71 +		vlMain.setExpandRatio(workTable, 1f);
    1.72  	}
    1.73  }