Changeset 204

Timestamp:

Feb 18, 2010, 10:41:10 AM (13 years ago)

Author:

duh

Message:

• temporary commit

Location:

trunk

Files:

• grails-app/controllers/dbnp/studycapturing/WizardController.groovy (modified) (1 diff)
• grails-app/views/wizard/pages/_groups.gsp (modified) (2 diffs)
• web-app/css/wizard.css (modified) (2 diffs)
• web-app/images/wizard (added)
• web-app/images/wizard/add-hover.png (added)
• web-app/images/wizard/add.png (added)
• web-app/images/wizard/remove-hover.png (added)
• web-app/images/wizard/remove.png (added)
• web-app/js/grouping.js (modified) (6 diffs)
• web-app/js/wizard.js (modified) (1 diff)

trunk/grails-app/controllers/dbnp/studycapturing/WizardController.groovy

@@ -87 +87 @@
                                                 researchQuestion: "",
                                                 description: "",
-                                                startDate: new Date().format("d/M/yyyy")
+                                                startDate: new Date()
                                         )
                                 }
-/*
-flow.study.getProperties().constraints.each() { key, value ->
-        println key
-        value.getProperties().each() {
-                println it
-        }
-}
-*/
+
                                 // assign template to study
                                 flow.study.template = Template.findByName(params.get('template'));

trunk/grails-app/views/wizard/pages/_groups.gsp

@@ -22 +22 @@
                 </g:each>
         </div>
+        <div class="middle">
+                <div class="actions">
+                        <div class="add"></div>
+                        <div class="remove"></div>
+                </div>
+        </div>
         <div class="right">
                 <div class="form">
@@ -32 +38 @@
                                 <div class="label">${group.name}</div>
                                 <div class="subjects">
-                                        <div class="subject">test subject 1</div>
-                                        <div class="subject">test subject 2</div>
-                                        <div class="subject">test subject 3</div>
                                 </div>
                         </div>

trunk/web-app/css/wizard.css

@@ -234 +234 @@
     height: 14px;
 }
+.wizard .grouping .middle {
+    display: inline-block;
+    float: left;
+}
+.wizard .grouping .add {
+    background: url(../images/wizard/add.png) no-repeat left top;
+    width: 149px;
+    height: 29px;
+    margin-top: 10px;
+    margin-left: 14px;
+}
+.wizard .grouping .add-hover {
+    background: url(../images/wizard/add-hover.png) no-repeat left top;
+}
+.wizard .grouping .remove {
+    background: url(../images/wizard/remove.png) no-repeat left top;
+    width: 149px;
+    height: 29px;
+    margin-top: 10px;
+}
+.wizard .grouping .remove-hover {
+    background: url(../images/wizard/remove-hover.png) no-repeat left top;    
+}
 .wizard .grouping .right {
     display: inline-block;
@@ -245 +268 @@
     border: 1px solid black;
     height: auto;
+}
+.wizard .grouping .ui-selected {
+    border: 4px solid red;
 }
 .wizard .grouping .group .label {

trunk/web-app/js/grouping.js

@@ -19 +19 @@
     groupsIdentifier:   null,
     groupIdentifier:    null,
-
-    init: function(itemsIdentifier, itemIdentifier, groupsIdentifier, groupIdentifier) {
+    addIdentifier:      null,
+    removeIdentifier:   null,
+
+    init: function(itemsIdentifier, itemIdentifier, groupsIdentifier, groupIdentifier, addIdentifier, removeIdentifier) {
         var that = this;
 
@@ -27 +29 @@
         this.groupsIdentifier   = groupsIdentifier;
         this.groupIdentifier    = groupIdentifier;
-
+        this.addIdentifier      = addIdentifier;
+        this.removeIdentifier   = removeIdentifier;
+
+        this.initAdd();
+        this.initRemove();
         this.initItems();
         this.initGroupItems();
@@ -36 +42 @@
     },
 
+    initAdd: function() {
+        var that = this;
+        var add = $(this.addIdentifier);
+
+        add.bind('mouseenter mouseleave',function() {
+            $(this).toggleClass('add-hover');
+        })
+
+        add.bind('click',function() {
+            that.addSelectedItemsToSelectedGroup();
+        });
+    },
+
+    addSelectedItemsToSelectedGroup: function() {
+        var that = this;
+        var groups = $(this.groupIdentifier, $(this.groupsIdentifier))
+        var group = $('.ui-selected', groups)
+        console.log(groups)
+        console.log(group)
+    },
+
+    initRemove: function() {
+        var that = this;
+        var remove = $(this.removeIdentifier);
+
+        remove.bind('mouseenter mouseleave',function() {
+            $(this).toggleClass('remove-hover');
+        })
+
+        remove.bind('click',function() {
+            console.log('removveeeee!!!!');
+        })
+    },
+
     initItems: function() {
         var that = this;
-        
+        console.log($(this.itemsIdentifier).first());
         //$(this.itemsIdentifier).
         $(this.itemsIdentifier).first().selectable({
@@ -50 +90 @@
 
     initGroups: function() {
+        var that = this;
+
+        // init group items
         this.initGroupItems();
+        
+        // init groups
+        $(this.itemsIdentifier).first().selectable({
+            filter: that.groupIdentifier,
+            stop: function() {
+
+            }
+        })
     },
 
@@ -57 +108 @@
 
         $(this.groupsIdentifier).selectable({
-            filter: that.itemIdentifier
+            filter: that.groupIdentifier
         })
     }
@@ -182 +233 @@
 }
 */
-
-// for debugging purposes this is here
-// TODO: to be be migrated to wizard.js....
-$(document).ready(function() {
-    new Grouping().init('div.subjects', 'div.subject', 'div.groups', 'div.group');
-});

trunk/web-app/js/wizard.js

@@ -43 +43 @@
     
     // GROUPING PAGE
-    //new Grouping().init('div.subjects', 'div.subject', 'div.groups', 'div.group');
+    new Grouping().init('div.subjects', 'div.subject', 'div.groups', 'div.group','div.add','div.remove');
 }