Changeset 8287 for mauRepo/MolesManager
- Timestamp:
- 20/04/12 22:25:48 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
mauRepo/MolesManager/trunk/src/MolesManager/static/js/cedaObservation.js
r8283 r8287 97 97 for (loopVal=0; loopVal<coObs.relatedParty.length; loopVal++){ 98 98 //var names=[]; 99 var innerDetails = {};99 100 100 var details = {} ; 101 101 if (typeof coObs.relatedParty[loopVal].role !='undefined'){ … … 104 104 //console.log(coObs.relatedParty[loopVal].role.name,loopVal) 105 105 for (loopInner=0; loopInner<coObs.relatedParty[loopVal].party.length; loopInner++){ 106 var innerDetails = {}; 106 107 innerDetails['type'] = coObs.relatedParty[loopVal].party[loopInner].__class__ 107 //names.push(coObs.relatedParty[loopVal].party[0].name) 108 108 109 109 if (coObs.relatedParty[loopVal].role.name == 'cl_pointofcontact'){ 110 110 try{ 111 111 innerDetails['helpEmail'] = coObs.relatedParty[loopVal].party[loopInner].contactInfo[0].address.electronicMailAddress[0]; 112 //helpEmail = "badc@rl.ac.uk"113 112 innerDetails['helpString'] = '<p>For assistance please contact <a href="mailto:' + innerDetails['helpEmail'] + '">'+ coObs.relatedParty[loopVal].party[loopInner].name +'</a>.</p>' 114 113 } … … 132 131 // G Vaughan (University of Manchester), PI should be just "Vaughan, G" in citation. 133 132 134 if (type [nameIn].type== 'CI_Organisation'){133 if (type == 'CI_Organisation'){ 135 134 return nameIn.split(' (')[0] 136 135 } … … 148 147 function createCitation(coObs,ids,rps,pubDetails,guid){ 149 148 var citationString =''; 150 citationString += '<p>' + citeNameArrange(Object.keys(rps['cl_author'])[0],rps['cl_author']); 149 authName = Object.keys(rps['cl_author'])[0] 150 citationString += '<p>' + citeNameArrange(authName,rps['cl_author'][authName].type); 151 151 if (rps.hasOwnProperty('cl_coinvestigator')){ 152 var orgCoauth = ''; 153 var indCoauth = ''; 154 152 155 for (loopVal=0; loopVal<Object.keys(rps['cl_coinvestigator']).length; loopVal++){ 153 citationString += '; ' + citeNameArrange(Object.keys(rps['cl_coinvestigator'])[loopVal],rps['cl_coinvestigator']) 154 } 156 157 var coInvName = Object.keys(rps['cl_coinvestigator'])[loopVal]; 158 // console.log(coInvName) 159 // console.log(rps['cl_coinvestigator'][coInvName]) 160 // console.log(rps['cl_coinvestigator'][coInvName].type) 161 if (rps['cl_coinvestigator'][coInvName].type == 'CI_Organisation'){ 162 orgCoauth += '; ' + citeNameArrange(coInvName,rps['cl_coinvestigator'][coInvName].type); 163 } 164 else { 165 166 indCoauth +='; ' + citeNameArrange(coInvName,rps['cl_coinvestigator'][coInvName].type); 167 } 168 } 169 citationString += orgCoauth; 170 citationString += indCoauth; 171 155 172 } 156 173 var dataYear=(ids.hasOwnProperty("DOI") && ids["DOI"].doiDate != pubDetails['pubYear'])?ids['DOI'].doiDate:pubDetails['pubYear']; … … 317 334 //----- Initializes the necessary widgets ------ 318 335 //---------------------------------------------- 319 //var obs_id = new dijit.form.TextBox({320 // value: '' /* no or empty value! */321 //}, 'obs_id');322 //obs_id.startup();323 324 336 // var button = new dijit.form.Button({ 325 337 // type: "submit", … … 328 340 // }, "search_obs"); 329 341 // button.startup(); 330 331 332 333 //var citation_id = new dijit.titlePane( 334 //{ 335 // value: "" 336 //}, "citation_id"); 337 //citation_id.startup(); 338 339 340 //---------------------------------------------- 341 //---------- Loads the widgets values ---------- 342 //---------------------------------------------- 343 344 var json = dojo.byId('coObs_id').value; 342 343 //---------------------------------------------- 344 //---------- Loads the widgets values ---------- 345 //---------------------------------------------- 346 347 var json = dojo.byId('coObs_id').value; 345 348 var guid = dojo.byId('guid_id').value; 346 349 coObs = dojo.fromJson(json); … … 352 355 console.log(coObs.identifier.length) 353 356 } 354 355 356 // var title_id = new dijit.TitlePane(357 // {358 // 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>'359 // },"title_id");360 // title_id.startup();361 362 357 var title_id = new dojo.html.set(dojo.byId("title_id"),'<h3>'+ids['ceda_title'].code+'</h3>'); 363 358 364 359 var rps = getRelatedParties(coObs); 365 360 var pubDetails = publicationDetails(coObs,ids); 366 361 367 362 var pubDetails_id = new dojo.html.set(dojo.byId("pubDetails_id"),pubDetails['pubString']); 368 363 369 364 if (coObs.resultAccumulation != null) { 370 var updateFreq_id = new dojo.html.set(dojo.byId("updateFreq_id"),'<p>Date Update Frequency: <b>'+coObs.resultAccumulation.value+'</b></p>'); 365 var freqText = (ids.hasOwnProperty('DOI'))?'notPlanned':coObs.resultAccumulation.value; 366 var updateFreq_id = new dojo.html.set(dojo.byId("updateFreq_id"),'<p>Date Update Frequency: <b>'+freqText+'</b></p>'); 371 367 } 372 368
Note: See TracChangeset
for help on using the changeset viewer.