Changeset 8278 for mauRepo/MolesManager

Timestamp:

20/04/12 18:40:15 (9 years ago)

Author:

gparton

Message:

added in project details and update frequency information, updated DOI info handling in preparation for MOLES2 DOI info change to cope with presence or not of full URL.

Location:

mauRepo/MolesManager/trunk/src/MolesManager/static

Files:

• js/cedaObservation.js (modified) (6 diffs)
• js/cedaSearch.js (modified) (1 diff)
• templates/cedaObservation.html (modified) (3 diffs)

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

@@ -118 +118 @@
                                                         }
                                                 }
-                                                console.log(loopVal)
-                                                console.log(coObs.relatedParty[loopVal].party[0])
-                                                console.log(coObs.relatedParty[loopVal].party[0].name)
                                                 details[coObs.relatedParty[loopVal].party[0].name] = innerDetails 
                         
@@ -173 +170 @@
                 if (ids.hasOwnProperty('DOI')){
                         var doi = ids['DOI'].code;
-                        var doiHttp = 'http://dx.doi.org/' + doi 
+                        var doiHttp = (doi.substring(0,18) != 'http://dx.doi.org/')?doiHttp = 'http://dx.doi.org/' + doi : doi;
                         citationString += ' ' + doi + '. ' + '<a href="' + doiHttp + '">' + doiHttp + '</a>';
                 }
@@ -348 +345 @@
                                 var guid = dojo.byId('guid_id').value;
                                 coObs = dojo.fromJson(json);
-                                console.log(guid)                               
+                                                                
                                 if (coObs != ''){
                                         var ids = getIDs(coObs);
@@ -364 +361 @@
                                         
                                         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 citation_id = new dijit.TitlePane(
@@ -377 +380 @@
                                                 var pastCitation_id = new dijit.TitlePane(
                                                 {
-                                                        title: "Previous Identifiers Used:", content: ids['moles2url'].code, open: 0
+                                                        title: "Previous Identifiers Used:", content: '<a href="'+ids['moles2url'].code+'">'+ids['moles2url'].code+'</a>', open: 0
                                                 },"pastCitation_id");
                                                 citation_id.startup();
@@ -417 +420 @@
 
                                         var dataLineage_id  = new dojo.html.set(dojo.byId("dataLineage_id"),'<p>' + coObs.dataLineage + '</p>');
-
+                                        if (coObs.inSupportOf.hasOwnProperty('abstract')){
+                                                if (coObs.inSupportOf.abstract != null){
+                                                        var project_id = new dijit.TitlePane(
+                                                {
+                                                        title: 'Project Abstract', content: '<p>'+coObs.inSupportOf.abstract+'</p>', open:0
+                                                },"project_id");
+                                                project_id.startup();
+                                                }
+                                                
+                                        }
                                         //dataLineage.startup(); 
                                         //dojo.attr("records_dataLineage", 'value', coObs.dataLineage);

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

@@ -22 +22 @@
                                  type: "submit",
                          label: "Search",
-                         onClick: function(){ console.log("First button was clicked!"); }
+                        // onClick: function(){ console.log("First button was clicked!"); }
                      }, "search_obs");
                      button.startup();

mauRepo/MolesManager/trunk/src/MolesManager/static/templates/cedaObservation.html

@@ -45 +45 @@
                 <div style="width:300px; height:175px" id="map" class="smallmap"></div>
                 <div id="resultTime_id"></div>
+                <div id='updateFreq_id'></div>
         </div>  
         <div class="grid_7 cedaObs" id="middleMiddle">
@@ -52 +53 @@
                         <div id="keywords_id"></div>
                         <div id="description_id"></div>
+                        <div id="project_id"></div>
                         <br />
                 </div><!-- End of div description -->
@@ -62 +64 @@
  <!-- End of div upper_section -->
 
-
 <div id="lower_section" class="grid_12 whiteFill">
+        <div class="grid_8 push_2 alpha">
+                        <h5>Additional Information</h5>
+        </div>
     <div id="lower_tab1" style="height:300px" class="grid_8 push_2 cedaObs">
-
+                
                 <script type="text/javascript">
                         /* require necessary classes */