Skip to content
Snippets Groups Projects
Commit 7e225acb authored by Tor-Einar Skog's avatar Tor-Einar Skog
Browse files

Fireblight web application

Path change
Minor layout adjustment
Fixing period selection for visible observations
parent 7e9ac094
No related branches found
No related tags found
No related merge requests found
...@@ -38,43 +38,45 @@ var compareSelectListOptions = function(a,b) ...@@ -38,43 +38,45 @@ var compareSelectListOptions = function(a,b)
/** /**
* Depends on the value of currentLanguage and defaultLanguage in /currentLanguage.js * Depends on the value of currentLanguage and defaultLanguage in /currentLanguage.js
* @param organism * @param organism
* @param language if you want to override system settings, specify language here
* @returns {String} * @returns {String}
*/ */
function getLocalizedOrganismName(organism) function getLocalizedOrganismName(organism, language)
{ {
// Fallback in case nothing works var preferredLanguage = language || environment.currentLanguage;
if(organism === null) // Fallback in case nothing works
{ if(organism === null)
return gettext("Unnamed"); {
} return gettext("Unnamed");
// Attempting the following languages (in order): current language, default language, English }
var languages = [environment.currentLanguage, environment.defaultLanguage, "en"]; // Attempting the following languages (in order): current language, default language, English
for(var j in languages) var languages = [preferredLanguage, environment.defaultLanguage, "en"];
{ for(var j in languages)
for(var i in organism.organismLocaleSet) {
{ for(var i in organism.organismLocaleSet)
var localeSet = organism.organismLocaleSet[i]; {
//console.log(localeSet); var localeSet = organism.organismLocaleSet[i];
if(localeSet.organismLocalePK.locale == languages[j]) //console.log(localeSet);
{ if(localeSet.organismLocalePK.locale == languages[j])
return localeSet.localName; {
} return localeSet.localName;
} }
} }
// Then we try the latin name }
if(organism.latinName !== null // Then we try the latin name
&& organism.latinName !== "") if(organism.latinName !== null
{ && organism.latinName !== "")
return organism.latinName; {
} return organism.latinName;
// Then the trade name }
if(organism.tradeName !== null // Then the trade name
&& organism.tradeName !== "") if(organism.tradeName !== null
{ && organism.tradeName !== "")
return organism.tradeName; {
} return organism.tradeName;
// Then we give up }
return gettext("Unnamed"); // Then we give up
return gettext("Unnamed");
} }
/** /**
......
...@@ -165,7 +165,11 @@ ...@@ -165,7 +165,11 @@
} }
table { table {
border-spacing: 10px; border-spacing: 5px 15px;
}
select
{
font-size: large;
} }
</style> </style>
</head> </head>
......
// The globally available map object // The globally available map object
var map, featureOverlay, newFeatureOverlay; var map, featureOverlay, newFeatureOverlay;
// Override localization settings for this particular web page
var hardcodedLanguage = "nb";
function initMap() function initMap()
{ {
// OpenStreetMap background layer // OpenStreetMap background layer
...@@ -11,7 +14,7 @@ function initMap() ...@@ -11,7 +14,7 @@ function initMap()
source: new ol.source.OSM({ source: new ol.source.OSM({
attributions: [ attributions: [
new ol.Attribution({ new ol.Attribution({
html: mapConstants.MAP_ATTRIBUTION html: "Kartgrunnlag: Statens kartverk (<a href='//creativecommons.org/licenses/by-sa/3.0/no/' target='new'>cc-by-sa-3.0</a>)"
}) })
] ]
}) })
...@@ -43,6 +46,11 @@ function initMap() ...@@ -43,6 +46,11 @@ function initMap()
type: 'base', type: 'base',
visible: true, visible: true,
source: new ol.source.TileWMS({ source: new ol.source.TileWMS({
attributions: [
new ol.Attribution({
html: "Kartgrunnlag: Statens kartverk (<a href='//creativecommons.org/licenses/by/4.0/deed.no' target='new'>cc-by-sa-4.0</a>)"
})
],
url: "//opencache.statkart.no/gatekeeper/gk/gk.open?", url: "//opencache.statkart.no/gatekeeper/gk/gk.open?",
params: { params: {
LAYERS: 'topo2', LAYERS: 'topo2',
...@@ -155,9 +163,8 @@ var styles = { ...@@ -155,9 +163,8 @@ var styles = {
}) })
}); });
// TODO pestId and from/to can't be hard coded
// TODO feature properties must be synchronized // TODO feature properties must be synchronized
$.getJSON("/rest/observation/filter/1/geoJSON?from=2016-01-01&to=2017-01-01&pestId=" + paerebrann.organismId, function(geoData){ $.getJSON("/rest/observation/filter/1/geoJSON?from=2012-01-01&pestId=" + paerebrann.organismId, function(geoData){
//console.info(geoData) //console.info(geoData)
var format = new ol.format.GeoJSON(); var format = new ol.format.GeoJSON();
...@@ -236,7 +243,7 @@ var displayFeature = function(feature) ...@@ -236,7 +243,7 @@ var displayFeature = function(feature)
'<button type="button" onclick="deleteFeature(' + feature.getId() + ')">Delete</button>', '<button type="button" onclick="deleteFeature(' + feature.getId() + ')">Delete</button>',
'<h3>Registrering</h3>', '<h3>Registrering</h3>',
'<table>', '<table>',
'<tr><td>Type</td><td>',getLocalizedOrganismName(feature.get("cropOrganism")),'</td></tr>', '<tr><td>Type</td><td>',getLocalizedOrganismName(feature.get("cropOrganism"),hardcodedLanguage),'</td></tr>',
'<tr><td>Størrelse</td><td>',observationData["forekomststorrelse"],'</td></tr>', '<tr><td>Størrelse</td><td>',observationData["forekomststorrelse"],'</td></tr>',
'<tr><td>Symptom</td><td>',observationData["symptom"],'</td></tr>', '<tr><td>Symptom</td><td>',observationData["symptom"],'</td></tr>',
'<tr><td>Tiltak</td><td>',observationData["tiltak"],'</td></tr>', '<tr><td>Tiltak</td><td>',observationData["tiltak"],'</td></tr>',
...@@ -455,7 +462,7 @@ var generateCropSelect = function(selectName, cropOrganisms, preselect) ...@@ -455,7 +462,7 @@ var generateCropSelect = function(selectName, cropOrganisms, preselect)
var retVal = '<select id="' + selectName + '" name="' + selectName + '">'; var retVal = '<select id="' + selectName + '" name="' + selectName + '">';
for(var i=0; i< cropOrganisms.length; i++) for(var i=0; i< cropOrganisms.length; i++)
{ {
retVal += '<option value="' + cropOrganisms[i].organismId + '"' + (cropOrganisms[i].organismId == preselect ? " selected=\"selected\"" : "") + '">' + getLocalizedOrganismName(cropOrganisms[i]) + '</option>'; retVal += '<option value="' + cropOrganisms[i].organismId + '"' + (cropOrganisms[i].organismId == preselect ? " selected=\"selected\"" : "") + '">' + getLocalizedOrganismName(cropOrganisms[i], hardcodedLanguage) + '</option>';
} }
retVal += '</select>'; retVal += '</select>';
return retVal; return retVal;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment