Added new model AddressInformation associated with Operator, modified Operator client sidem #38

Author: gicaz

api/controllers/AddressInformationController.js

@@ -0,0 +1,10 @@
+/**
+ * AddressInformationController
+ *
+ * @description :: Server-side logic for managing contactinformations
+ * @help        :: See http://links.sailsjs.org/docs/controllers
+ */
+
+module.exports = {
+
+};

api/models/AddressInformation.js

@@ -0,0 +1,55 @@
+/**
+ * ContactInformation.js
+ *
+ * @description :: Contact Information according to the MIABIS format
+ */
+
+module.exports = {
+
+    tableName: 'address_information',
+
+    attributes: {
+        // MIABIS-07C
+        office: {
+            type: 'string',
+            required: true
+        },
+        phone: {
+            type: 'string',
+            required: true
+        },
+        // MIABIS-07E
+        address: {
+            type: 'text',
+            required: true
+        },
+        // MIABIS-07F
+        zip: {
+            type: 'string',
+            required: true
+        },
+        // MIABIS-07G
+        city: {
+            type: 'string',
+            alpha: true,
+            required: true
+        },
+        // MIABIS-07H
+        country: {
+            type: 'string',
+            alpha: true,
+            required: true,
+            minLength: 2,
+            maxLength: 2
+        },
+        createdAt: {
+            type: 'datetime',
+            columnName: 'created_at'
+        },
+        updatedAt: {
+            type: 'datetime',
+            columnName: 'updated_at'
+        }
+
+    }
+};

api/models/Biobank.js

@@ -16,7 +16,7 @@ module.exports = {
         acronym: {
             columnName: 'acronym',
             type: 'string',
-            required: true,
+            required: true
         },
         // MIABIS-03
         name: {
@@ -65,4 +65,3 @@ module.exports = {
 
     }
 };
-

api/models/Operator.js

@@ -41,18 +41,6 @@ var Operator = {
             columnName: 'email'
         },
 
-        laboratory: {
-            type: 'string',
-            required: true,
-            columnName: 'laboratory'
-        },
-
-        phone: {
-            type: 'string',
-            required: true,
-            columnName: 'phone'
-        },
-
         login: {
             type: 'string',
             required: true,
@@ -64,6 +52,11 @@ var Operator = {
             via: 'user'
         },
 
+        addressInformation: {
+            columnName: 'address_information',
+            model: 'addressInformation'
+        },
+
         createdAt: {
             type:'datetime',
             columnName: 'created_at'

assets/js/application/Router.js

@@ -527,8 +527,8 @@
             var that = this;
             var operator = new Operator.Model();
             if (id) {
-                operator.set('id', id);
                 operator.fetch({
+                    data:$.param({id: id, populate:['addressInformation']}),
                     success: function(operator) {
                         that.loadView(new Operator.Views.Edit({model: operator}));
                     },

assets/js/modules/AddressInformation.js

@@ -0,0 +1,49 @@
+/**
+ * @author  Massimiliano Izzo
+ * @description This file contains the Backbone classes for handling AddressInformation
+ *              models, collections and views according to the MIABIS standard
+ */
+(function(xtens, AddressInformation) {
+    // dependencies
+    var i18n = xtens.module("i18n").en;
+
+    // XTENS router alias
+    var router = xtens.router;
+
+    AddressInformation.Model = Backbone.Model.extend({
+        urlRoot: '/addressInformation'
+    });
+
+    AddressInformation.List = Backbone.Collection.extend({
+        url: '/addressInformation',
+        model: AddressInformation.Model
+    });
+
+    AddressInformation.Views.Edit = Backbone.View.extend({
+
+        initialize: function(options) {
+            this.template = JST["views/templates/addressinformation-edit.ejs"];
+        },
+
+        bindings: {
+            '#office': 'office',
+            '#phone': 'phone',
+            '#address':'address',
+            '#zip': 'zip',
+            '#city': 'city',
+            '#country': 'country'
+        },
+
+        render: function() {
+            this.$el.html(this.template({__: i18n}));
+            this.stickit();
+            return this;
+        }
+
+    });
+
+    AddressInformation.Views.List = Backbone.View.extend({
+        //TODO
+    });
+
+} (xtens, xtens.module("addressinformation")));

assets/js/modules/Operator.js

@@ -5,6 +5,7 @@
     var i18n = xtens.module('i18n').en;
     var router = xtens.router;
     var Group = xtens.module('group');
+    var AddressInformation = xtens.module("addressinformation");
     var GroupsOperator =xtens.module('groupsOperator');
     var sexOptions = xtens.module('xtensconstants').SexOptions;
     var ModalDialog = xtens.module('xtensbootstrap').Views.ModalDialog;
@@ -33,6 +34,9 @@
 
     Operator.Views.Edit = Backbone.View.extend({
 
+        tagName: 'div',
+        className: 'operator',
+
         events: {
             'click button.delete': 'deleteOperator',
             'submit .edit-operator-form': 'saveOperator'
@@ -42,6 +46,11 @@
             $('#main').html(this.el);
             this.template = JST['views/templates/operator-edit.ejs'];
             this.render();
+
+            this.personalAddressView = new AddressInformation.Views.Edit({
+                model: new AddressInformation.Model(this.model.get("addressInformation"))
+            });
+            this.$("#address-information-cnt").append(this.personalAddressView.render().el);
         },
 
         bindings: {
@@ -108,14 +117,6 @@
                 observe: 'email'
             },
 
-            '#laboratory': {
-                observe: 'laboratory'
-            },
-
-            '#phone': {
-                observe: 'phone'
-            },
-
             '#login': 'login'
 
 
@@ -132,34 +133,40 @@
 
         saveOperator: function(ev) {
             var that = this;
+            var addressInformation = _.clone(this.personalAddressView.model.attributes);
             if(!that.model.get('id')){
                 that.model.set('password',$('#password').val());
             }
-            that.model.save(null, {
-                success: function(operator) {
-                    if (that.modal) {
-                        that.modal.hide();
-                    }
-                    var modal = new ModalDialog({
-                        title: i18n('ok'),
-                        body: i18n('operator-correctly-stored-on-server')
-                    });
-                    that.$modal.append(modal.render().el);
-                    $('.modal-header').addClass('alert-success');
-                    modal.show();
-
-                    setTimeout(function(){ modal.hide(); }, 1200);
-                    that.$('.operator-modal').on('hidden.bs.modal', function (e) {
-                        modal.remove();
-                        xtens.router.navigate('operators', {trigger: true});
-                    });
+            this.personalAddressView.model.save(null,{
+                success: function(addressInformation) {
+                    that.model.save({addressInformation:addressInformation.id}, {
+                        success: function(operator) {
+                            if (that.modal) {
+                                that.modal.hide();
+                            }
+                            var modal = new ModalDialog({
+                                title: i18n('ok'),
+                                body: i18n('operator-correctly-stored-on-server')
+                            });
+                            that.$modal.append(modal.render().el);
+                            $('.modal-header').addClass('alert-success');
+                            modal.show();
 
+                            setTimeout(function(){ modal.hide(); }, 1200);
+                            that.$('.operator-modal').on('hidden.bs.modal', function (e) {
+                                modal.remove();
+                                xtens.router.navigate('operators', {trigger: true});
+                            });
+                        },
+                        error: function(model, res) {
+                            xtens.error(res);
+                        }
+                    });
                 },
                 error: function(model, res) {
                     xtens.error(res);
                 }
             });
-
             return false;
         },
 

assets/js/modules/i18n.js

@@ -120,6 +120,9 @@
         "update-data": "Update Data",
         "subject": "Subject",
         "sample": "Sample",
+        /* views/templates/addressinformation-edit.ejs */
+        "office": "Office",
+        "address-information": "Address Information",
         /* views/templates/operator-edit.ejs */
         "operator-manager": "Operator Manager",
         "confirm-password": "Confirm Password",

assets/styles/pages/xtens-operator.less

@@ -1,8 +1,5 @@
 #operator {
     width: 100%;
-}
-#operator .edit-operator-form{
-
 }
 #operator .col-md-6{
 border-radius: 5px;
@@ -28,6 +25,28 @@ font-size: 16px;
 #edit{
 font-family: "Times New Roman", Times, serif;
 font-size: 16px;
+}
 
-
+.operator {
+    width: 100%;
+}
+.operator h2,h3 {
+    margin-top: 15px;
+    margin-bottom: 15px;
+}
+.operator .operator-label {
+    .make-sm-column(1);
+    .make-xs-column(2);
+}
+.operator .operator-halfinput-div {
+    .make-sm-column(5);
+    .make-xs-column(10);
+}
+.operator .operator-thirdinput-div {
+    .make-sm-column(3);
+    .make-xs-column(10);
+}
+.operator .operator-input-div {
+    .make-sm-column(11);
+    .make-xs-column(10);
 }