virtualcommons-svn Mailing List for Virtual Commons Experiment Software (Page 5)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

1 new commit in vcweb:

https://bitbucket.org/virtualcommons/vcweb/commits/8d18dfa33725/
Changeset:   8d18dfa33725
User:        alllee
Date:        2013-07-06 01:02:49
Summary:     exposing experiment metadata and configurations as KO view models
Affected #:  3 files

diff -r a39b82baecf660fc700d87ae0948786bd2ab3646 -r 8d18dfa337252f71d737114f0b0acceb88a10b55 vcweb/core/models.py

--- a/vcweb/core/models.py
+++ b/vcweb/core/models.py
@@ -133,12 +133,13 @@
 
 class ExperimentMetadata(models.Model):
     """
-    An ExperimentMetadata record represents the *type* of a given implemented Experiment, e.g., **Forestry** or
-    **Irrigation**.  This shouldn't be confused with a **Forestry** or **Irrigation** Experiment instance, which
-    represents a concrete experiment run, with a specific configuration, experimenter, etc.  Each experiment app
-    should define and add a single ExperimentMetadata record for the experiment type that it represents.  You can
-    register an ExperimentMetadata object by creating a JSON/YAML/SQL representation of it in your app/fixtures
-    directory (e.g., irrigation/fixtures/irrigation.json) and then invoking ``python manage.py loaddata irrigation``.
+    An ExperimentMetadata record represents the *type* of a given implemented Experiment, e.g., **forestry**, **lighter
+    footprints**, **boundary effects**, or **irrigation**.  This shouldn't be confused with a specific instance of a
+    **forestry** or ** lighter footprints ** experiment, which represents a concrete experiment run, with a specific
+    configuration, experimenter, etc.  Each experiment metadata app should define and add a single ExperimentMetadata
+    record for the experiment type that it represents.  You can register an ExperimentMetadata object by creating a
+    JSON/YAML/SQL representation of it in your app/fixtures directory (e.g., irrigation/fixtures/irrigation.json) and
+    then invoking ``python manage.py loaddata irrigation``.
     """
     title = models.CharField(max_length=255)
     # the URL fragment that this experiment_metadata will occupy,
@@ -155,6 +156,18 @@
 
     objects = ExperimentMetadataManager()
 
+    def to_dict(self, include_configurations=False, **kwargs):
+        data = {
+                'title': self.title,
+                'namespace': self.namespace,
+                'date_created': self.date_created,
+                'description': self.description,
+                }
+        if include_configurations:
+            configurations = [ec.to_dict() for ec in ExperimentConfiguration.objects.filter(experiment_metadata=self)]
+            data['configurations'] = configurations
+        return data
+
     def natural_key(self):
         return [self.namespace]
 
@@ -291,6 +304,18 @@
         return self.experiment_metadata.namespace
 
 
+    def to_dict(self, **kwargs):
+        return {
+                'name': self.name,
+                'treatment_id': self.treatment_id,
+                'date_created': self.date_created.strftime("%m-%d-%Y %H:%M"),
+                'creator': self.creator,
+                'max_group_size': self.max_group_size,
+                'is_experimenter_driven': self.is_experimenter_driven,
+                'number_of_rounds': self.final_sequence_number,
+                }
+
+
     def serialize(self, output_format='xml', **kwargs):
         if self.round_configuration_set.count() > 0:
             all_objects = []

diff -r a39b82baecf660fc700d87ae0948786bd2ab3646 -r 8d18dfa337252f71d737114f0b0acceb88a10b55 vcweb/core/templates/experimenter/dashboard.html
--- a/vcweb/core/templates/experimenter/dashboard.html
+++ b/vcweb/core/templates/experimenter/dashboard.html
@@ -15,14 +15,14 @@
             Experiment metadata objects go here
             <div data-bind='foreach: experimentMetadataList'><h3 data-bind='text: title'></h3>
-                <div data-bind='foreach: experimentConfigurationList'>
+                <div data-bind='foreach: configurations'><div class='alert alert-message'>
-                        <h4><span data-bind='text: name'>configuration name</span> (Treatment <span data-bind='text: treatment_id'></span>) <span class='pull-right' data-bind='text: date_created'>date created</span></h4>
-                        description? number of rounds?  max group size? is experimenter driven?
+                        <h4><span data-bind='text: name'>configuration name</span> (treatment id: <span data-bind='text: treatment_id() || "None"'></span>) <span class='pull-right' data-bind='text: date_created'></span></h4>
+                        <span data-bind='text: number_of_rounds'></span> rounds, groups of <span data-bind='text: max_group_size'></span><br><div class='btn-group'>
-                            <a class='btn' data-bind='click: createNewExperiment'><i class='icon-plus-sign'></i> new</a>
-                            <a class='btn' data-bind='click: modify'><i class='icon-edit'></i> edit</a>
+                            <a class='btn' data-bind='click: $root.createNewExperiment'><i class='icon-plus-sign'></i> new</a>
+                            <a class='btn' data-bind='click: $root.modify'><i class='icon-edit'></i> edit</a></div></div>
 
@@ -76,7 +76,21 @@
 {% block javascript %}
 {{ block.super }}
 <script type='text/javascript'>
+    var dashboardViewModelJson = $.parseJSON("{{ dashboardViewModelJson|escapejs }}");
     $(function() {
+        function DashboardViewModel(dashboardViewModelJson) {
+            var self = this;
+            var model = ko.mapping.fromJS(dashboardViewModelJson);
+            model.createNewExperiment = function() {
+                console.debug("create new experiment from configuration");
+            }
+            model.modify = function() {
+                console.debug("modify existing configuration");
+            }
+            return model;
+        }
+        var model = new DashboardViewModel(dashboardViewModelJson);
+        ko.applyBindings(model);
         $('a.confirm-experiment-action').on("click", function(evt) {
             evt.preventDefault();
             var self = $(this);

diff -r a39b82baecf660fc700d87ae0948786bd2ab3646 -r 8d18dfa337252f71d737114f0b0acceb88a10b55 vcweb/core/views.py
--- a/vcweb/core/views.py
+++ b/vcweb/core/views.py
@@ -87,6 +87,27 @@
         else:
             return [ 'participant/dashboard.html' ]
 
+    def get_experimenter_dashboard_view_model(self, experimenter):
+        experiment_metadata_list = []
+        for em in ExperimentMetadata.objects.all():
+            data = em.to_dict(include_configurations=True)
+            experiment_metadata_list.append(data)
+        logger.debug("experiment metadata list: %s", experiment_metadata_list)
+        data = {
+                'experimentMetadataList': experiment_metadata_list
+                }
+
+        return dumps(data)
+
+
+    def get_context_data(self, **kwargs):
+        context = super(Dashboard, self).get_context_data(**kwargs)
+        user = self.request.user
+        if is_experimenter(user):
+            experimenter = user.experimenter
+            context['dashboardViewModelJson'] = self.get_experimenter_dashboard_view_model(experimenter)
+        return context
+
     def get_queryset(self):
         user = self.request.user
         if is_experimenter(user):

Repository URL: https://bitbucket.org/virtualcommons/vcweb/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.




2008	Jan	Feb	Mar	Apr	May	Jun (1)	Jul (21)	Aug (31)	Sep (6)	Oct (15)	Nov (2)	Dec (9)
2009	Jan (4)	Feb (6)	Mar (12)	Apr (52)	May (14)	Jun (19)	Jul (81)	Aug (115)	Sep (36)	Oct (88)	Nov (46)	Dec (58)
2010	Jan (52)	Feb (55)	Mar (48)	Apr (15)	May (5)	Jun (38)	Jul (27)	Aug (24)	Sep (28)	Oct (1)	Nov (2)	Dec (29)
2011	Jan (87)	Feb (39)	Mar (63)	Apr (42)	May (26)	Jun (53)	Jul (23)	Aug (43)	Sep (37)	Oct (25)	Nov (4)	Dec (7)
2012	Jan (73)	Feb (79)	Mar (62)	Apr (28)	May (12)	Jun (2)	Jul (9)	Aug (1)	Sep (8)	Oct	Nov (3)	Dec (3)
2013	Jan (8)	Feb (16)	Mar (38)	Apr (74)	May (62)	Jun (15)	Jul (49)	Aug (19)	Sep (9)	Oct	Nov	Dec
2014	Jan	Feb	Mar	Apr (2)	May (25)	Jun	Jul	Aug	Sep	Oct	Nov	Dec

virtualcommons-svn Mailing List for Virtual Commons Experiment Software (Page 5)

virtualcommons-svn — Virtual Commons source control (SVN/HG) commit traffic