- Timestamp:
- 01/10/12 15:48:25 (7 years ago)
- Location:
- mauRepo/MolesManager/trunk/cedaMoles/MolesManager
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
mauRepo/MolesManager/trunk/cedaMoles/MolesManager/settings.py
r8574 r8587 232 232 INFO_DB_CONNECTION = os.environ['INFO_DB_CONNECTION'] 233 233 234 RUN_MIGRATION = True234 RUN_MIGRATION = False 235 235 #Default to one day 236 236 MIGRATION_INTERVAL = 86400 -
mauRepo/MolesManager/trunk/cedaMoles/MolesManager/static/js/cedaObservation.js
r8435 r8587 12 12 var innerDict = {}; 13 13 innerDict['code'] = coObs.identifier[loopVal].code; 14 if (coObs.identifier[loopVal].authority.title == 'DOI'){ 15 innerDict['doiDate'] = (coObs.identifier[loopVal].authority.hasOwnProperty('date') && coObs.identifier[loopVal].authority.date.length != 0 )?coObs.identifier[loopVal].authority.date.dateTime8601.year:coObs.resultTime.position.dateTime8601.year; 16 } 17 idDict[coObs.identifier[loopVal].authority.title] = innerDict; 18 } 14 15 try { 16 if (coObs.identifier[loopVal].authority.title == 'DOI'){ 17 innerDict['doiDate'] = (coObs.identifier[loopVal].authority.hasOwnProperty('date') && coObs.identifier[loopVal].authority.date.length != 0 )?coObs.identifier[loopVal].authority.date.dateTime8601.year:coObs.resultTime.position.dateTime8601.year; 18 } 19 } 20 catch(err){ 21 console.log('error on DOI') 22 } 23 try { 24 idDict[coObs.identifier[loopVal].authority.title] = innerDict; 25 } 26 catch(err){ 27 console.log('empty title field') 28 } 29 30 } 19 31 return idDict 20 32 } 33 21 34 22 35 function docLinkObj(moles2url){ … … 28 41 function downloadLink(result){ 29 42 var dltext = (result.source[0].name != null)?'<p><b>' + result.source[0].name + ':</b> ': '<p><b>Data Download Link:</b> '; 30 dltext += '<a href="'+ result.source[0].linkage + '">' + result.source[0].function .value+ '</a>';43 dltext += '<a href="'+ result.source[0].linkage + '">' + result.source[0].function + '</a>'; 31 44 dltext += '</p>'; 32 45 //console.log(dltext) … … 43 56 } 44 57 45 function publicationDetails(coObs ,ids){58 function publicationDetails(coObs_old,ids){ 46 59 var pubDetails = {}; 47 var typePub=(ids.hasOwnProperty('DOI'))?"Dataset is Citable <br /> additional metadata fields may be added ": coObs .publicationState.value;60 var typePub=(ids.hasOwnProperty('DOI'))?"Dataset is Citable <br /> additional metadata fields may be added ": coObs_old.publicationState.value; 48 61 49 62 pubDetails['pubType'] = typePub; 50 pubDetails['pubYear'] = coObs.resultTime.position.dateTime8601.year; 51 pubDetails['pubMonth'] = timeLead0(coObs.resultTime.position.dateTime8601.month) 52 pubDetails['pubDay'] = timeLead0(coObs.resultTime.position.dateTime8601.day) 63 64 65 try { 66 pubDetails['pubYear'] = coObs.resultTime.position.dateTime8601.year; 67 pubDetails['pubMonth'] = timeLead0(coObs.resultTime.position.dateTime8601.month) 68 pubDetails['pubDay'] = timeLead0(coObs.resultTime.position.dateTime8601.day) 69 70 } 71 catch(err){ 72 pubDetails['pubYear'] = 'undefined' 73 pubDetails['pubMonth'] = '' 74 pubDetails['pubDay'] = '' 75 } 53 76 pubDetails['pubString'] = '<p> Record Status: <b>'+ pubDetails['pubType'] +'</b><br /> Available: <b>' + pubDetails['pubYear'] +'-'+ pubDetails['pubMonth'] + '-' + pubDetails['pubDay']+'</b></p>'; 54 77 return pubDetails … … 130 153 } 131 154 catch(err){ 132 innerDetails['helpString'] = '<p>For assistance email <a href="mailto: badc@rl.ac.uk"> BADCSupport</a>.</p>'155 innerDetails['helpString'] = '<p>For assistance email <a href="mailto:support@ceda.ac.uk"> CEDA Support</a>.</p>' 133 156 } 134 157 } … … 136 159 137 160 relatedPartyDict[coObs.relatedParty[loopVal].role] = details;//names; 138 } 139 } 140 } 141 } 161 162 } 163 } 164 } 165 } 166 //innerDetails['helpString'] = '<p>For assistance email <a href="mailto:support@ceda.ac.uk"> CEDA Support</a>.</p>' 167 142 168 return relatedPartyDict 143 169 } … … 240 266 241 267 function bboxText(extents){ 242 var box_extents = [extents[0].westBoundLongitude.value,extents[0].southBoundLatitude.value,extents[0].eastBoundLongitude.value,extents[0].northBoundLatitude.value] 268 try { 269 var box_extents = [extents[0].westBoundLongitude.value,extents[0].southBoundLatitude.value,extents[0].eastBoundLongitude.value,extents[0].northBoundLatitude.value] 270 } 271 272 catch(err){ 273 var box_extents = [-180,-90,180,90] 274 } 275 243 276 return '<p><b>Bounding Box:</b>:</p><p>N: ' + box_extents[3] + '<br />W: ' + box_extents[0] + ' E: ' + box_extents[2] + '<br />S: '+ box_extents[1] + '</p>' 244 277 } … … 272 305 //---------------------------------------------- 273 306 307 var old_json = dojo.byId('old_coObs_id').value; 274 308 var json = dojo.byId('coObs_id').value; 309 275 310 if (json == ''){ 276 311 var title_id = new dojo.html.set(dojo.byId("title_id"),'<h3>The required item does not exist.</h3>'); … … 282 317 var guid = dojo.byId('guid_id').value; 283 318 coObs = dojo.fromJson(json); 284 285 if (coObs != ''){ 319 old_coObs = dojo.fromJson(old_json); 320 var coOobs = ' '; 321 322 if (coObs != '' && old_coObs != ''){ 323 324 if (navigator.userAgent.toLowerCase().indexOf('chrome') > -1){ 325 console.log(coObs) 326 console.log(old_coObs) 327 } 328 329 var ids = getIDs(old_coObs); 330 var pubDetails_old = publicationDetails(old_coObs,ids); 331 var old_rps = getRelatedParties(old_coObs); 332 333 try { 334 var title_id = new dojo.html.set(dojo.byId("title_id"),'<h3>'+ ids['ceda_title'].code+'</h3>'); 335 } 336 catch(err){ 337 console.log('no title') 338 } 339 340 coObs.resultTime.year 341 coObs.resultTime.month 342 coObs.resultTime.day 343 344 var pubString = '<p> Record Status: <b>'+ pubDetails_old['pubType'] +'</b><br /> Available: <b>' + coObs.resultTime.year +'-'+ coObs.resultTime.month + '-' + coObs.resultTime.day +'</b></p>'; 345 var pubDetails_id = new dojo.html.set(dojo.byId("pubDetails_id"),pubString); 346 347 var citation_id = new dijit.TitlePane( 348 { 349 title: 'Citation', content: createCitation(old_coObs,ids,old_rps,pubDetails_old,guid) 350 },"citation_id"); 351 citation_id.startup(); 352 353 // var dataLineage_id = new dojo.html.set(dojo.byId("dataLineage_id"),'<p>' + coObs.dataLineage + '</p>'); 354 var description_id = new dijit.TitlePane( 355 { 356 title: 'Description', content: coObs.description, open:1 357 },"description_id"); 358 description_id.startup(); 359 360 var dataLink_id = new dojo.html.set(dojo.byId("datalink_id"),downloadLink(old_coObs.result)); 361 362 var access_id = new dojo.html.set(dojo.byId("access_id"),accessLink(old_coObs.permission)); 363 364 try { 365 var help_id = new dojo.html.set(dojo.byId("help_id"),old_rps['pointofcontact'][functional.keys(old_rps['pointofcontact'])[0]].helpString); 366 } 367 catch(err){ 368 console.log('no point of contact given') 369 } 370 371 var bbox_id = new dijit.TitlePane( 372 { 373 title: 'Geographical Extent', content: bboxText(coObs.geographicExtent), open:1 374 },"bbox_id"); 375 bbox_id.startup(); 376 377 } 378 379 if (coOobs != ''){ 286 380 var ids = getIDs(coObs); 287 381 if (navigator.userAgent.toLowerCase().indexOf('chrome') > -1){ … … 291 385 var title_id = new dojo.html.set(dojo.byId("title_id"),'<h3>'+ids['ceda_title'].code+'</h3>'); 292 386 293 var rps = getRelatedParties(coObs); 294 var pubDetails = publicationDetails(coObs,ids); 295 296 var pubDetails_id = new dojo.html.set(dojo.byId("pubDetails_id"),pubDetails['pubString']); 297 298 if (coObs.resultAccumulation != null) { 299 var freqText = (ids.hasOwnProperty('DOI'))?'notPlanned':coObs.resultAccumulation.value; 300 var updateFreq_id = new dojo.html.set(dojo.byId("updateFreq_id"),'<p>Date Update Frequency: <b>'+freqText+'</b></p>'); 301 } 302 303 var citation_id = new dijit.TitlePane( 304 { 305 title: 'Citation', content: createCitation(coObs,ids,rps,pubDetails,guid) 306 },"citation_id"); 307 citation_id.startup(); 308 309 if (ids.hasOwnProperty("moles2url")){ 310 var pastCitation_id = new dijit.TitlePane( 311 { 312 title: "Previous Identifiers Used:", content: '<a href="'+ids['moles2url'].code+'">'+ids['moles2url'].code+'</a>', open: 0 313 },"pastCitation_id"); 314 citation_id.startup(); 315 } 316 317 var dataLink_id = new dojo.html.set(dojo.byId("datalink_id"),downloadLink(coObs.result)); 318 319 var access_id = new dojo.html.set(dojo.byId("access_id"),accessLink(coObs.permission)); 320 321 var help_id = new dojo.html.set(dojo.byId("help_id"),rps['pointofcontact'][functional.keys(rps['pointofcontact'])[0]].helpString); 322 323 cedaol.drawMap(coObs.geographicExtent,'map',ids); 324 325 var resultTime_id = new dojo.html.set(dojo.byId("resultTime_id"),resultTime(coObs.phenomenonTime)['timeString']); 326 327 328 dojo.attr("help_id",'value',''); 329 330 var docLink_id = new dojo.html.set(dojo.byId("docLink_id"),docLinkObj(ids['moles2url'].code)); 331 332 var bbox_id = new dijit.TitlePane( 333 { 334 title: 'Geographical Extent', content: bboxText(coObs.geographicExtent), open:0 335 },"bbox_id"); 336 bbox_id.startup(); 337 // var dublinCoreHolder_id = new dojo.html.set(dojo.byId("dublinCoreHolder_id"),dubCoreContent(coObs,rps)); 338 339 var keywords_id = new dijit.TitlePane( 340 { 341 title: 'Keywords', content: keywordsText(coObs.keywords), open:1 342 },"keywords_id"); 387 // var rps = getRelatedParties(coObs); 388 389 // var pubDetails_id = new dojo.html.set(dojo.byId("pubDetails_id"),pubDetails['pubString']); 390 391 // if (coObs.resultAccumulation != null) { 392 // var freqText = (ids.hasOwnProperty('DOI'))?'notPlanned':coObs.resultAccumulation.value; 393 // var updateFreq_id = new dojo.html.set(dojo.byId("updateFreq_id"),'<p>Date Update Frequency: <b>'+freqText+'</b></p>'); 394 // } 395 396 // var citation_id = new dijit.TitlePane( 397 // { 398 // // title: 'Citation', content: createCitation(coObs_old,ids,rps,pubDetails,guid) 399 // },"citation_id"); 400 // citation_id.startup(); 401 402 // if (ids.hasOwnProperty("moles2url")){ 403 // var pastCitation_id = new dijit.TitlePane( 404 // { 405 // title: "Previous Identifiers Used:", content: '<a href="'+ids['moles2url'].code+'">'+ids['moles2url'].code+'</a>', open: 0 406 // },"pastCitation_id"); 407 // citation_id.startup(); 408 // } 409 410 411 // cedaol.drawMap(coObs.geographicExtent,'map',ids); 412 413 // var resultTime_id = new dojo.html.set(dojo.byId("resultTime_id"),resultTime(coObs.phenomenonTime)['timeString']); 414 415 416 // dojo.attr("help_id",'value',''); 417 418 // var docLink_id = new dojo.html.set(dojo.byId("docLink_id"),docLinkObj(ids['moles2url'].code)); 419 420 // var bbox_id = new dijit.TitlePane( 421 // { 422 // title: 'Geographical Extent', content: bboxText(coObs.geographicExtent), open:0 423 // },"bbox_id"); 424 // bbox_id.startup(); 425 //var dublinCoreHolder_id = new dojo.html.set(dojo.byId("dublinCoreHolder_id"),dubCoreContent(coObs,rps)); 426 427 // var keywords_id = new dijit.TitlePane( 428 // { 429 // title: 'Keywords', content: keywordsText(coObs.keywords), open:1 430 // },"keywords_id"); 343 431 //keywords_id.startup(); 344 432 345 var description_id = new dijit.TitlePane(346 {347 title: 'Description', content: coObs.description, open:1348 },"description_id");433 // var description_id = new dijit.TitlePane( 434 // { 435 // title: 'Description', content: coObs.description, open:1 436 // },"description_id"); 349 437 //description_id.startup(); 350 438 351 var dataLineage_id = new dojo.html.set(dojo.byId("dataLineage_id"),'<p>' + coObs.dataLineage + '</p>');352 if (coObs.inSupportOf.hasOwnProperty('abstract')){353 if (coObs.inSupportOf.abstract != null){354 var project_id = new dijit.TitlePane(355 {356 title: 'Project Abstract', content: '<p>'+coObs.inSupportOf.abstract+'</p>', open:0357 },"project_id");358 project_id.startup();359 }439 // var dataLineage_id = new dojo.html.set(dojo.byId("dataLineage_id"),'<p>' + coObs.dataLineage + '</p>'); 440 // if (coObs.inSupportOf.hasOwnProperty('abstract')){ 441 // if (coObs.inSupportOf.abstract != null){ 442 // var project_id = new dijit.TitlePane( 443 // { 444 // title: 'Project Abstract', content: '<p>'+coObs.inSupportOf.abstract+'</p>', open:0 445 // },"project_id"); 446 // project_id.startup(); 447 // } 360 448 361 }449 // } 362 450 //dataLineage.startup(); 363 451 //dojo.attr("records_dataLineage", 'value', coObs.dataLineage); -
mauRepo/MolesManager/trunk/cedaMoles/MolesManager/static/templates/cedaObservation.html
r8503 r8587 11 11 12 12 {% block main %} 13 <input type="hidden" name="coObs" id="coObs_id" value='{{ coObs }}' /> 13 <input type="hidden" name="coObs" id="old_coObs_id" value='{{ coObs }}' /> 14 <input type="hidden" name="new_coObs" id="coObs_id" value='{{ new_coObs }}' /> 14 15 15 16 <script type="text/javascript"> … … 40 41 </div> 41 42 <div data-dojo-type="dijit.layout.ContentPane" title="Help"> 42 <div id="help_id">For assistance contact <a href="mailto: badc@rl.ac.uk">badc@rl.ac.uk</a></div>43 <div id="help_id">For assistance contact <a href="mailto:support@ceda.ac.uk">support@ceda.ac.uk</a></div> 43 44 </div> 44 45 </div> -
mauRepo/MolesManager/trunk/cedaMoles/MolesManager/views/cedaObservationView.py
r8538 r8587 53 53 context['coObs'] = encodeToJSON(record) 54 54 55 #context['new_coObs'] = encodeCedaMoles2Json(record)55 context['new_coObs'] = encodeCedaMoles2Json(record) 56 56 57 57 guid = request.moles3EPB.retrieveGUIDFromInstance(record) 58 58 if guid: 59 60 59 context['guid'] = guid.id 60 print context['guid'] 61 61 print context['coObs'] 62 62 -
mauRepo/MolesManager/trunk/cedaMoles/MolesManager/views/moles2gui/ceda/observation.py
r8517 r8587 50 50 'resultTime': 'resultTime', 51 51 'geographicExtent': 'geographicExtent', 52 'identifier': 'identifier' 52 'identifier': 'identifier', 53 'description': 'description', 54 'citation': 'citation' 53 55 } 54 56 acceptedTypes = [CEDA_Observation] -
mauRepo/MolesManager/trunk/cedaMoles/MolesManager/views/moles2gui/mo/responsiblePartyInfo.py
r8486 r8587 52 52 for party in getattr(self, 'party'): 53 53 if party.helpEmail is None or len(party.helpEmail) == 0: 54 party.helpString = '<p>For assistance email <a href="mailto: badc@rl.ac.uk"> BADCSupport</a>.</p>'54 party.helpString = '<p>For assistance email <a href="mailto:support@ceda.ac.uk"> CEDA Support</a>.</p>' 55 55 else: 56 56 party.helpString = '<p>For assistance please contact <a href="mailto:' + party.helpEmail[0] + '">'+ party.name +'</a>.</p>'
Note: See TracChangeset
for help on using the changeset viewer.