Changeset 34918
- Timestamp:
- 2021-02-24T00:27:56+13:00 (3 years ago)
- Location:
- main/trunk/model-sites-dev/eurovision-lod/collect/eurovision
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/js/eurovision.js
r34913 r34918 1 1 2 // The following needs to be kept in sync with the .voting-countries & .voting-points widths in css/eurovision.css 2 3 var glob_voting_country_and_points_width = (180+35); … … 41 42 42 43 var library_name = gs.xsltParams["library_name"]; 43 //var site_name = gs.xsltParams["site_name"];44 44 var coll_name = gs.cgiParams["c"]; 45 45 46 //var collect_http_path = gs.collectionMetadata["httpPath"];47 46 var collect_doc_prefix_url = library_name + "/collection/" + coll_name + "/document/"; 48 47 … … 53 52 var $to_country_name = $('<div>').attr("class","voting voting-country").append(""); 54 53 var $to_country_points = $('<div>').attr("class","voting voting-points").append(""); 55 54 var $a_from_country = $('<span>'); 55 56 56 // check to see if trans_i position is within array, otherwise default to filler 57 57 if (trans_i < num_countries) { … … 62 62 if (typeof from_country_points !== 'undefined') { 63 63 var from_country_base = from_country.replace(/-(T|J)$/,""); 64 var pp_from_country = from_country_base; // in future look to spacing back in for countries like United Kingdom64 var pp_from_country = from_country_base; // in future look to putting spacing back in for countries like United Kingdom 65 65 66 66 var hyphen_vote_type = from_country.match(/-(?:T|J)$/); … … 68 68 var href_from_country = collect_doc_prefix_url + from_country_id; 69 69 70 var $a_from_country = $('<a>').attr("href",href_from_country).append(pp_from_country); 70 //var $a_from_country = $('<a>').attr("href",href_from_country).append(pp_from_country); 71 var $a_from_country = $('<a>').attr("href",href_from_country); 71 72 72 $from_country_name = $('<div>').attr("class","voting voting-country").append($a_from_country).append(":")73 //$from_country_name = $('<div>').attr("class","voting voting-country").append(pp_from_country +":");74 $from_country_points = $('<div>').attr("class","voting voting-points").append(from_country_points); 73 //$from_country_name = $('<div>').attr("class","voting voting-country").append($a_from_country).append(":") 74 $from_country_name = $('<div>').attr("class","voting voting-country").append(pp_from_country).append(":"); 75 $from_country_points = $('<div>').attr("class","voting voting-points").append(from_country_points); 75 76 } 76 77 } 77 78 79 /* 78 80 $('#to-country-votes') 79 81 .append($from_country_name) 80 82 .append($from_country_points); 83 */ 84 $a_from_country 85 .append($from_country_name) 86 .append($from_country_points); 87 $('#to-country-votes') 88 .append($a_from_country); 81 89 82 90 } … … 106 114 } 107 115 108 function append_from_country_votes( from_country_year_id,vote_type)116 function append_from_country_votes(vote_type) 109 117 { 110 118 if (vote_type != "") { … … 135 143 from_country_votes.sort(compare_countries); 136 144 145 var library_name = gs.xsltParams["library_name"]; 146 var coll_name = gs.cgiParams["c"]; 147 148 var collect_doc_prefix_url = library_name + "/collection/" + coll_name + "/document/"; 149 150 var year = gs.documentMetadata["FromCountryYear"]; 151 137 152 for (var i=0; i<num_cells; i++) { 138 153 … … 141 156 var $to_country_name = $('<div>').attr("class","voting voting-country").append(""); 142 157 var $to_country_points = $('<div>').attr("class","voting voting-points").append(""); 143 158 var $a_to_country = $('<span>'); 159 144 160 // check to see if trans_i position is within array, otherwise default to filler 145 161 if (trans_i < num_countries) { 146 var to_country = from_country_votes[trans_i].Country; 162 var pp_to_country = from_country_votes[trans_i].Country; 163 var to_country = pp_to_country.replace(/\s+/g,""); 164 147 165 var to_country_points = from_country_votes[trans_i].Points; 148 166 149 167 if (typeof to_country_points !== 'undefined') { 168 169 //var doc_id = gs.cgiParams["d"]; 170 //var hyphen_vote_type = doc_id.match(/-(?:T|J)$/); 171 var to_country_id = to_country + year; 172 var href_to_country = collect_doc_prefix_url + to_country_id; 173 174 //$a_to_country = $('<a>').attr("href",href_to_country).append(pp_to_country); 175 $a_to_country = $('<a>').attr("href",href_to_country) 150 176 151 $to_country_name = $('<div>').attr("class","voting voting-country").append(to_country + ":"); 152 $to_country_points = $('<div>').attr("class","voting voting-points").append(to_country_points); 177 $to_country_name = $('<div>').attr("class","voting voting-country").append(pp_to_country).append(":"); 178 //$to_country_name = $('<div>').attr("class","voting voting-country").append($a_to_country).append(":"); 179 $to_country_points = $('<div>').attr("class","voting voting-points").append(to_country_points); 153 180 } 154 181 } 155 156 $('#from-country-votes') 157 .append($to_country_name) 158 .append($to_country_points); 159 182 183 //if ($a_to_country) { 184 $a_to_country 185 .append($to_country_name) 186 .append($to_country_points); 187 $('#from-country-votes') 188 .append($a_to_country); 189 ///} 190 /* 191 else { 192 $('#from-country-votes') 193 .append($to_country_name) 194 .append($to_country_points); 195 } 196 */ 160 197 } 161 198 } -
main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/transform/pages/document.xsl
r34911 r34918 175 175 <div id="from-country-votes"> 176 176 <gsf:script> 177 append_from_country_votes(gs.documentMetadata[" Identifier"],gs.documentMetadata["FromCountryType"]);177 append_from_country_votes(gs.documentMetadata["FromCountryType"]); 178 178 </gsf:script> 179 179 </div>
Note:
See TracChangeset
for help on using the changeset viewer.