Changeset 8287 for mauRepo/MolesManager

Timestamp:

20/04/12 22:25:48 (8 years ago)

Author:

gparton

Message:

order of names in citation now author, coAuthOrg, coAuthInd...

File:

• mauRepo/MolesManager/trunk/src/MolesManager/static/js/cedaObservation.js (modified) (7 diffs)

mauRepo/MolesManager/trunk/src/MolesManager/static/js/cedaObservation.js

@@ -97 +97 @@
                 for (loopVal=0; loopVal<coObs.relatedParty.length; loopVal++){
                         //var names=[];
-                        var innerDetails = {};
+                        
                         var details = {} ;
                         if (typeof coObs.relatedParty[loopVal].role !='undefined'){
@@ -104 +104 @@
                                                 //console.log(coObs.relatedParty[loopVal].role.name,loopVal)
                                         for (loopInner=0; loopInner<coObs.relatedParty[loopVal].party.length; loopInner++){
+                                                var innerDetails = {};
                                                 innerDetails['type'] = coObs.relatedParty[loopVal].party[loopInner].__class__
-                                                        //names.push(coObs.relatedParty[loopVal].party[0].name)
-
+                                                
                                                 if (coObs.relatedParty[loopVal].role.name == 'cl_pointofcontact'){
                                                         try{
                                                                 innerDetails['helpEmail'] = coObs.relatedParty[loopVal].party[loopInner].contactInfo[0].address.electronicMailAddress[0];
-                                                        //helpEmail = "badc@rl.ac.uk"
                                                                 innerDetails['helpString'] = '<p>For assistance please contact <a href="mailto:' + innerDetails['helpEmail'] + '">'+ coObs.relatedParty[loopVal].party[loopInner].name +'</a>.</p>'
                                                         }
@@ -132 +131 @@
         // G Vaughan (University of Manchester), PI should be just "Vaughan, G" in citation.
                 
-                if (type[nameIn].type == 'CI_Organisation'){
+                if (type == 'CI_Organisation'){
                         return nameIn.split(' (')[0]
                 }
@@ -148 +147 @@
         function createCitation(coObs,ids,rps,pubDetails,guid){
                 var citationString ='';
-                citationString += '<p>' + citeNameArrange(Object.keys(rps['cl_author'])[0],rps['cl_author']);
+                authName = Object.keys(rps['cl_author'])[0]
+                citationString += '<p>' + citeNameArrange(authName,rps['cl_author'][authName].type);
                 if (rps.hasOwnProperty('cl_coinvestigator')){
+                        var orgCoauth = '';
+                        var indCoauth = '';
+
                         for (loopVal=0; loopVal<Object.keys(rps['cl_coinvestigator']).length; loopVal++){ 
-                                citationString += '; ' + citeNameArrange(Object.keys(rps['cl_coinvestigator'])[loopVal],rps['cl_coinvestigator'])
-                        }
+                                
+                                var coInvName = Object.keys(rps['cl_coinvestigator'])[loopVal];
+                                // console.log(coInvName)
+                                // console.log(rps['cl_coinvestigator'][coInvName])
+                                // console.log(rps['cl_coinvestigator'][coInvName].type)
+                                if (rps['cl_coinvestigator'][coInvName].type == 'CI_Organisation'){
+                                        orgCoauth += '; ' + citeNameArrange(coInvName,rps['cl_coinvestigator'][coInvName].type);
+                                }
+                                else {
+                                        
+                                        indCoauth +='; ' + citeNameArrange(coInvName,rps['cl_coinvestigator'][coInvName].type);
+                                }
+                        }
+                        citationString += orgCoauth;
+                        citationString += indCoauth;
+                        
                 }
                 var dataYear=(ids.hasOwnProperty("DOI") && ids["DOI"].doiDate != pubDetails['pubYear'])?ids['DOI'].doiDate:pubDetails['pubYear'];
@@ -317 +334 @@
                          //----- Initializes the necessary widgets ------
                          //----------------------------------------------
-                         //var obs_id = new dijit.form.TextBox({
-                        //       value: '' /* no or empty value! */
-                         //}, 'obs_id');
-                         //obs_id.startup();
-                         
                          // var button = new dijit.form.Button({
                                  // type: "submit",
@@ -328 +340 @@
                      // }, "search_obs");
                      // button.startup();
-                         
-                         
-                         
-                         //var citation_id = new dijit.titlePane(
-                                 //{
-                        //       value: ""
-                         //}, "citation_id");
-                         //citation_id.startup();
-                                
-        
-                         //----------------------------------------------
-                         //---------- Loads the widgets values ----------
-                         //----------------------------------------------
-                                          
-                        var json = dojo.byId('coObs_id').value;
+
+                                //----------------------------------------------
+                                //---------- Loads the widgets values ----------
+                                //----------------------------------------------
+
+                                var json = dojo.byId('coObs_id').value;
                                 var guid = dojo.byId('guid_id').value;
                                 coObs = dojo.fromJson(json);
@@ -352 +355 @@
                                                 console.log(coObs.identifier.length)
                                         }
-                                        
-                                        
-                                        // var title_id = new dijit.TitlePane(
-                                        // {
-                                                // title: 'CEDA Dataset Metadat Record', content: '<div class="grid_2"><div id="cedaObsLogo"></div><div id="pubDetails_id"></div></div><div class="grid_7"><h3>'+ids['ceda_title']+'</h3></div>'
-                                        // },"title_id");
-                                        // title_id.startup();
-                                        
                                         var title_id  = new dojo.html.set(dojo.byId("title_id"),'<h3>'+ids['ceda_title'].code+'</h3>'); 
-                                        
+
                                         var rps = getRelatedParties(coObs);
                                         var pubDetails = publicationDetails(coObs,ids);
                                         
                                         var pubDetails_id  = new dojo.html.set(dojo.byId("pubDetails_id"),pubDetails['pubString']); 
-                                        
+
                                         if (coObs.resultAccumulation != null) {
-                                                var updateFreq_id = new dojo.html.set(dojo.byId("updateFreq_id"),'<p>Date Update Frequency: <b>'+coObs.resultAccumulation.value+'</b></p>');
+                                                var freqText = (ids.hasOwnProperty('DOI'))?'notPlanned':coObs.resultAccumulation.value;
+                                                var updateFreq_id = new dojo.html.set(dojo.byId("updateFreq_id"),'<p>Date Update Frequency: <b>'+freqText+'</b></p>');
                                         }