Modified address modal and xtenspg query to retrieve owner info #38

Author: gicaz

assets/js/modules/XtensTable.js

@@ -35,6 +35,7 @@
       var Data = xtens.module("data");
       var Sample = xtens.module("sample");
       var DataFile = xtens.module("datafile");
+      var AddressInformation = xtens.module("addressinformation");
       var VIEW_OVERVIEW = Privileges.VIEW_OVERVIEW;
       var ModalDialog = xtens.module("xtensbootstrap").Views.ModalDialog;
 
@@ -167,21 +168,25 @@
                           return pr.id === data.type;
                       });
 
+                      var address = new AddressInformation.Model({id: data.owner_address});
+                      var addressDeferred = address.fetch();
 
-                      if (that.modal) {
-                          that.modal.hide();
-                      }
-                      var modal = new ModalDialog({
-                          template: JST["views/templates/address-modal.ejs"],
-                          data: { __: i18n, project: project[0], data: data}
-                      });
+                      $.when(addressDeferred).then(function(addressRes) {
+                          if (that.modal) {
+                              that.modal.hide();
+                          }
+                          var modal = new ModalDialog({
+                              template: JST["views/templates/address-modal.ejs"],
+                              data: { __: i18n, project: project[0], data: data, address: addressRes}
+                          });
 
-                      that.$modal.append(modal.render().el);
-                      modal.show();
+                          that.$modal.append(modal.render().el);
+                          modal.show();
 
-                      that.$('.query-modal').on('hidden.bs.modal', function (e) {
-                          modal.remove();
-                          $('.modal-backdrop').remove();
+                          that.$('.query-modal').on('hidden.bs.modal', function (e) {
+                              modal.remove();
+                              $('.modal-backdrop').remove();
+                          });
                       });
 
                   } );
@@ -219,7 +224,7 @@
               }
               var flattenedFields = this.dataType.getFlattenedFields(); // get the names of all the madatafields but those within loops;
               this.columns = this.insertModelSpecificColumns(this.dataType.get("model"), xtens.session.get('canAccessPersonalData'));
-              this.columns.push({"title": i18n("owner"), "data": "owner.lastName", "className": "owner"});
+              this.columns.push({"title": i18n("owner"), "data": "owner_surname", "className": "owner"});
 
               this.numLeft=this.columns.length;
 

views/templates/address-modal.ejs

@@ -16,31 +16,31 @@
               <div class="form-group metadataform-group">
                   <label for="firstName" class="data-label"><%= __('given-name') %></label>
                   <div class="data-input-div">
-                      <span class="form-control" id="firstName" placeholder="Name" name="firstName" ><%= data.owner.lastName %></span>
+                      <span class="form-control" id="firstName" placeholder="Name" name="firstName" ><%= data.owner_surname %></span>
                   </div>
               </div>
               <div class="form-group metadataform-group">
                   <label for="lastName" class="data-label"><%= __('surname') %></label>
                   <div class="data-input-div">
-                      <span class="form-control" id="lastName" placeholder="Surname" name="lastName" ><%= data.owner.firstName %></span>
+                      <span class="form-control" id="lastName" placeholder="Surname" name="lastName" ><%= data.owner_name %></span>
                   </div>
               </div>
               <div class="form-group metadataform-group">
-                  <label for="birthDate" class="data-label"><%= __('laboratory') %></label>
+                  <label for="birthDate" class="data-label"><%= __('office') %></label>
                   <div class="data-input-div">
-                      <span class="form-control" id="birthDate" name="birthDate" placeholder="<%= __('please-select') %>" ><%= data.owner.laboratory %></span>
+                      <span class="form-control" id="birthDate" name="birthDate" placeholder="<%= __('please-select') %>" ><%= address.office %></span>
                   </div>
               </div>
               <div class="form-group metadataform-group">
                   <label for="email" class="data-label"><%= __('email') %></label>
                   <div class="data-input-div">
-                      <span name="email" type="email" class="form-control" id="email" placeholder="ex@example.com"><%= data.owner.email %></span>
+                      <span name="email" type="email" class="form-control" id="email" placeholder="ex@example.com"><%= data.owner_email %></span>
                   </div>
               </div>
               <div class="form-group metadataform-group">
                   <label for="login" class="data-label"><%= __('phone') %></label>
                   <div class="data-input-div">
-                      <span class="form-control" id="login" name="login" placeholder="Username" ><%= data.owner.phone %></span>
+                      <span class="form-control" id="login" name="login" placeholder="Username" ><%= address.phone %></span>
                   </div>
               </div>
             </div>