Changeset 353

Timestamp:

07/05/12 12:49:21 (13 years ago)

Author:

hendrikvanantwerpen

Message:

Added DB code to sessions page.
Removed old static mockups.
Removed dup widgets.

Location:

Dev/branches/rest-dojo-ui/client

Files:

• mSurvey2.html (deleted)
• rft/pages/sessions.html (modified) (2 diffs)
• rft/pages/sessions.js (modified) (1 diff)
• rft/ui/LineWithActionsWidgetThijs.js (deleted)
• rft/ui/SelectorThijs.js (deleted)
• rft/ui/templates/LineWithActionsWidgetThijs.html (deleted)
• rft/ui/templates/SelectorThijs.html (deleted)

Dev/branches/rest-dojo-ui/client/rft/pages/sessions.html

@@ -1 +1 @@
 <div data-dojo-type="rft.pages.sessions">
-    <script>
-        function createNew(){
-            var newBox = new rft.ui.ObjectBox({
-                title: 'TeamUp Basic Template',
-                subTitle: '',
-                lowerTitle: '',
-                objectType: 'SessionTemplate',
-                actions: {
-                    "edit": function() {},
-                    "delete": function() {}
-                }
-            });
-            newBox.startup();
-            newBox.placeAt("containerTemplates", "last");
-        }
-        
-        function createInstance(args) {
-            // Create a template instance in the "Sessions" tab
-            var args;
-            args.objectType = "Session";
-            var d = new Date();
-            var dateString = d.getDate()+"-"+d.getMonth()+"-"+d.getFullYear();
-            var creator = "Igor Mayer"; // Use currently logged in profile instead!
-            args.subTitle = "Created on "+dateString+" by "+creator;
-        
-            args.actions = {
-                "edit": function() {},
-                "delete": function() {}
-            }
-            var newBox = new rft.ui.ObjectBox(args);
-            newBox.startup();
-            newBox.placeAt("containerSessions", "last");
-
-            // TODO: Then switch tabs to the Sessions tab!
-            var sess = dijit.byId("dijit_layout_ContentPane_5");
-            dijit.byId("tabs").selectChild(sess);
-        }
-    </script>
     <div data-dojo-type="dijit.layout.BorderContainer" data-dojo-props="region:'center'" style="height: 500px;">
         <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'top'">
@@ -48 +10 @@
             <div data-dojo-type="dijit.layout.TabContainer" class="green" data-dojo-props="tabPosition:'left-h',region:'center'" id="tabs">
                 <div data-dojo-type="dijit.layout.BorderContainer" title="Templates">
-                    <div id="containerTemplates" data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region: 'center'">
-                        <!--TODO: These don't allow for custom icon settings yet! -->
-                        <div data-dojo-type="rft.ui.ObjectBox" data-dojo-props="actions: {'edit': function(){alert('Custom edit code');}, 'delete':function(){}, 'Custom function': function(){alert('newCommand');}, 'publish': function(){alert('createInstance');}}"></div>
+                    <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region: 'center'" data-rft-attach-point="containerTemplates">
                     </div>
                     <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region: 'bottom'" style="height: 40px;">
-                        <div data-dojo-type="dijit.form.Button" data-dojo-props="region: 'bottom', baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconSessionTemplate', onClick: function(){alert('createNew');}">Create new template</div>
+                        <div data-dojo-type="dijit.form.Button" data-dojo-props="region: 'bottom', baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconSessionTemplate'" data-rft-attach-event="onClick:onAddSessionTemplate">Create new template</div>
                     </div>
                 </div>
                 <div data-dojo-type="dijit.layout.ContentPane" title="Sessions">
-                    <div id="containerSessions" data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region: 'center'">
-
+                    <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region: 'center'" data-rft-attach-point="containerSessions">
                     </div>
                     <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region: 'bottom'" style="height: 40px;">

Dev/branches/rest-dojo-ui/client/rft/pages/sessions.js

@@ -1 @@
-define(['dojo/_base/declare','dojo/_base/lang','dojo/_base/Deferred','dojo/data/ObjectStore','rft/auth','rft/store','rft/content','rft/ui/_Page'],
-    function(declare,lang,Deferred,ObjectStore,auth,store,content,_Page){
+define(['dojo/_base/declare','dojo/_base/lang','rft/store','rft/content','rft/ui/_Page','rft/ui/ObjectBox'],
+    function(declare,lang,store,content,_Page,ObjectBox){
         return declare('rft.pages.sessions',[_Page],{
             selectedObject: null,
             onVisit: function() {
-                this.grid.setStore(
-                    ObjectStore({objectStore: store}),
-                    "_design/default/_view/by_type",{key:'Survey'});
-                
-                this.grid.on('rowclick',lang.hitch(this,function(evt){
-                    this.selectedObject = evt.grid.getItem(evt.rowIndex);
-                    this.btnEdit.set('disabled',!this.selectedObject);
+                this._refresh();
+            },
+            _refresh: function() {
+                this.containerTemplates.set('content','');
+                this.containerSessions.set('content','');
+                this._refreshByType('SessionTemplate',this.containerTemplates.domNode);
+                this._refreshByType('SessionInstance',this.containerSessions.domNode);
+            },
+            _refreshByType: function(type,container) {
+                store.query("_design/default/_view/by_type",{key:type})
+                .forEach(lang.hitch(this,function(obj){
+                    var widget = new ObjectBox({
+                        title: obj.title || "Untitled",
+                        actions: {
+                            "Edit": function(){alert('Custom edit code');},
+                            "Delete": lang.hitch(this,function(){
+                                store.remove(store.getIdentity(obj),store.getRevision(obj))
+                                .then(lang.hitch(this,function(){
+                                    this._refresh();
+                                }));
+                            }),
+                            "Custom function": function(){alert('newCommand');},
+                            "Publish": lang.hitch(this,this._publishSession,obj)
+                        }
+                    });
+                    widget.startup();
+                    widget.placeAt(container, "last");
                 }));
-
-                this.grid.on('rowdblclick',lang.hitch(this,function(evt){
-                    var obj = evt.grid.getItem(evt.rowIndex);
-                    content.goTo('/survey',{uid:store.getIdentity(obj)});
+            },
+            onAddSessionTemplate: function(){
+                store.put({
+                    type: 'SessionTemplate',
+                    title: 'TeamUp Basic Template'
+                })
+                .then(lang.hitch(this,function(){
+                    this._refresh();
                 }));
-                                
-                this.btnNew.on('click',lang.hitch(this,function(){
-                    Deferred.when( store.add({type:'Survey',creator:auth.getUser()}) )
-                    .then(function(obj) {
-                        content.goTo('/survey',{uid:store.getIdentity(obj)});
-                    });
-                }));
-
-                this.btnEdit.on('click',lang.hitch(this,function(){
-                    if ( this.selectedObject ) {
-                        content.goTo('/survey',{uid:store.getIdentity(this.selectedObject)});
-                    }
-                    
+            },
+            _publishSession: function(sessionTemplate) {
+                var publishDate = new Date();
+                var session = {
+                    type: "SessionInstance",
+                    title: sessionTemplate.title,
+                    date: publishDate.getDate()+"-"+publishDate.getMonth()+"-"+publishDate.getFullYear(),
+                    creator: "Igor Mayer"
+                };
+                store.add(session)
+                .then(lang.hitch(this,function(){
+                    this._refresh();
                 }));
             }