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

Merge branch 'grovfor_kalibreringsminne' into develop

parents 55705f26 eeb09127
Branches
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 114 additions and 91 deletions
roughage/locale/nb/LC_MESSAGES/django.mo
+ 0
− 0
View file @ aa52b49e
No preview for this file type
roughage/locale/nb/LC_MESSAGES/django.po
+ 36
− 43
View file @ aa52b49e
......@@ -3,116 +3,109 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-01-05 14:07+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"POT-Creation-Date: 2020-06-09 13:00+0200\n"
"PO-Revision-Date: 2020-06-09 13:01+0200\n"
"Language: nb\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Last-Translator: \n"
"Language-Team: \n"
"X-Generator: Poedit 2.0.6\n"
#: templates/roughage/nutrition.html:24
#: templates/roughage/nutrition.html:26
#: templates/roughage/nutrition.html:24 templates/roughage/nutrition.html:27
msgid "Roughage nutrition model"
msgstr "Grovfôrmodellen"
#: templates/roughage/nutrition.html:59
#: templates/roughage/nutrition.html:72
msgid "Soil type"
msgstr "Jordtype"
#: templates/roughage/nutrition.html:69
#: templates/roughage/nutrition.html:82
msgid "Clover share"
msgstr "Kløverandel"
#: templates/roughage/nutrition.html:79
#: templates/roughage/nutrition.html:92
msgid "First harvest date"
msgstr "Dato førsteslått"
#: templates/roughage/nutrition.html:84
#: templates/roughage/nutrition.html:97
msgid "Second harvest date"
msgstr "Dato andreslått"
#: templates/roughage/nutrition.html:89
msgid "Run model"
msgstr "Kjør modell"
#: templates/roughage/nutrition.html:108
#: templates/roughage/nutrition.html:119
msgid "Use weather scenarios"
msgstr "Bruk værscenarier"
#: templates/roughage/nutrition.html:111
#: templates/roughage/nutrition.html:122
msgid "Mean daily temperature"
msgstr "Middeltemperatur pr. døgn"
#: templates/roughage/nutrition.html:120
#: templates/roughage/nutrition.html:131
msgid "Daily precipitation"
msgstr "Nedbør pr. døgn"
#: templates/roughage/nutrition.html:129
#: templates/roughage/nutrition.html:140
msgid "Daily global radiation"
msgstr "Globalstråling pr. døgn"
#: templates/roughage/nutrition.html:143
#: templates/roughage/nutrition.html:154
msgid "Add artificial watering"
msgstr "Legg til vanning"
#: templates/roughage/nutrition.html:193
#: templates/roughage/nutrition.html:255
#: templates/roughage/nutrition.html:164
msgid "Delete matrix contents"
msgstr "Tøm matrise for kalibreringsverdier"
#: templates/roughage/nutrition.html:212 templates/roughage/nutrition.html:274
msgid "Time of day"
msgstr "Klokkeslett"
#: templates/roughage/nutrition.html:205
#: templates/roughage/nutrition.html:267
#: templates/roughage/nutrition.html:224 templates/roughage/nutrition.html:286
msgid "Harvest width"
msgstr "Slåttebredde"
#: templates/roughage/nutrition.html:212
#: templates/roughage/nutrition.html:274
#: templates/roughage/nutrition.html:231 templates/roughage/nutrition.html:293
msgid "Estimated harvest"
msgstr "Estimert avling"
#: templates/roughage/nutrition.html:221
#: templates/roughage/nutrition.html:283
#: templates/roughage/nutrition.html:240 templates/roughage/nutrition.html:302
msgid "Conditioning"
msgstr "Kondisjonering"
#: templates/roughage/nutrition.html:223
#: templates/roughage/nutrition.html:285
#: templates/roughage/nutrition.html:242 templates/roughage/nutrition.html:304
msgid "Weak"
msgstr "Svak"
#: templates/roughage/nutrition.html:224
#: templates/roughage/nutrition.html:286
#: templates/roughage/nutrition.html:243 templates/roughage/nutrition.html:305
msgid "Strong"
msgstr "Sterk"
#: templates/roughage/nutrition.html:225
#: templates/roughage/nutrition.html:287
#: templates/roughage/nutrition.html:244 templates/roughage/nutrition.html:306
msgid "Crushed"
msgstr "Knust"
#: templates/roughage/nutrition.html:232
#: templates/roughage/nutrition.html:294
#: templates/roughage/nutrition.html:251 templates/roughage/nutrition.html:313
msgid "String width"
msgstr "Strengbredde"
#: templates/roughage/nutrition.html:239
#: templates/roughage/nutrition.html:301
#: templates/roughage/nutrition.html:258 templates/roughage/nutrition.html:320
msgid "Estimated dry matter fraction"
msgstr "Anslått tørrstoffprosent"
#: templates/roughage/nutrition.html:314
#: templates/roughage/nutrition.html:332
msgid "Run model"
msgstr "Kjør modell"
#: templates/roughage/nutrition.html:336
msgid "Model is running, please wait"
msgstr "Modellen kjører, vennligst vent"
#: templates/roughage/nutrition.html:333
#: templates/roughage/nutrition.html:355
msgid "Results"
msgstr "Resultater"
roughage/locale/zh_CN/LC_MESSAGES/django.mo
+ 0
− 0
View file @ aa52b49e
No preview for this file type
roughage/locale/zh_CN/LC_MESSAGES/django.po
+ 28
− 24
View file @ aa52b49e
......@@ -7,101 +7,105 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-09-28 13:04-0700\n"
"POT-Creation-Date: 2020-06-09 13:00+0200\n"
"PO-Revision-Date: 2016-11-03 13:59+0100\n"
"Last-Translator: \n"
"Language-Team: \n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"Last-Translator: \n"
"Language-Team: \n"
"X-Generator: Poedit 1.8.7\n"
#: templates/roughage/nutrition.html:24 templates/roughage/nutrition.html:27
msgid "Roughage nutrition model"
msgstr "粗粮营养模型"
#: templates/roughage/nutrition.html:60
#: templates/roughage/nutrition.html:72
msgid "Soil type"
msgstr "土壤类型"
#: templates/roughage/nutrition.html:70
#: templates/roughage/nutrition.html:82
msgid "Clover share"
msgstr "苜蓿共享"
#: templates/roughage/nutrition.html:80
#: templates/roughage/nutrition.html:92
msgid "First harvest date"
msgstr "第一次收获日期"
#: templates/roughage/nutrition.html:85
#: templates/roughage/nutrition.html:97
msgid "Second harvest date"
msgstr "第二次收获日期"
#: templates/roughage/nutrition.html:107
#: templates/roughage/nutrition.html:119
msgid "Use weather scenarios"
msgstr "使用天气情景"
#: templates/roughage/nutrition.html:110
#: templates/roughage/nutrition.html:122
msgid "Mean daily temperature"
msgstr "日均温"
#: templates/roughage/nutrition.html:119
#: templates/roughage/nutrition.html:131
msgid "Daily precipitation"
msgstr "日降水量"
#: templates/roughage/nutrition.html:128
#: templates/roughage/nutrition.html:140
msgid "Daily global radiation"
msgstr "日全球辐射"
#: templates/roughage/nutrition.html:142
#: templates/roughage/nutrition.html:154
msgid "Add artificial watering"
msgstr "人工加水"
#: templates/roughage/nutrition.html:197 templates/roughage/nutrition.html:259
#: templates/roughage/nutrition.html:164
msgid "Delete matrix contents"
msgstr ""
#: templates/roughage/nutrition.html:212 templates/roughage/nutrition.html:274
msgid "Time of day"
msgstr "一天中的时间"
#: templates/roughage/nutrition.html:209 templates/roughage/nutrition.html:271
#: templates/roughage/nutrition.html:224 templates/roughage/nutrition.html:286
msgid "Harvest width"
msgstr "收获的宽度"
#: templates/roughage/nutrition.html:216 templates/roughage/nutrition.html:278
#: templates/roughage/nutrition.html:231 templates/roughage/nutrition.html:293
msgid "Estimated harvest"
msgstr "估算的收获"
#: templates/roughage/nutrition.html:225 templates/roughage/nutrition.html:287
#: templates/roughage/nutrition.html:240 templates/roughage/nutrition.html:302
msgid "Conditioning"
msgstr "情形"
#: templates/roughage/nutrition.html:227 templates/roughage/nutrition.html:289
#: templates/roughage/nutrition.html:242 templates/roughage/nutrition.html:304
msgid "Weak"
msgstr "弱"
#: templates/roughage/nutrition.html:228 templates/roughage/nutrition.html:290
#: templates/roughage/nutrition.html:243 templates/roughage/nutrition.html:305
msgid "Strong"
msgstr "强"
#: templates/roughage/nutrition.html:229 templates/roughage/nutrition.html:291
#: templates/roughage/nutrition.html:244 templates/roughage/nutrition.html:306
msgid "Crushed"
msgstr "奔溃"
#: templates/roughage/nutrition.html:236 templates/roughage/nutrition.html:298
#: templates/roughage/nutrition.html:251 templates/roughage/nutrition.html:313
msgid "String width"
msgstr "线宽"
#: templates/roughage/nutrition.html:243 templates/roughage/nutrition.html:305
#: templates/roughage/nutrition.html:258 templates/roughage/nutrition.html:320
msgid "Estimated dry matter fraction"
msgstr "估算的干物质组成比例"
#: templates/roughage/nutrition.html:317
#: templates/roughage/nutrition.html:332
msgid "Run model"
msgstr "运行模型"
#: templates/roughage/nutrition.html:321
#: templates/roughage/nutrition.html:336
msgid "Model is running, please wait"
msgstr "模型在运行中，请等候"
#: templates/roughage/nutrition.html:340
#: templates/roughage/nutrition.html:355
msgid "Results"
msgstr "结果"
roughage/locale/zh_Hans/LC_MESSAGES/django.mo
+ 0
− 0
View file @ aa52b49e
No preview for this file type
roughage/locale/zh_Hans/LC_MESSAGES/django.po
+ 28
− 24
View file @ aa52b49e
......@@ -7,101 +7,105 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-09-28 13:04-0700\n"
"POT-Creation-Date: 2020-06-09 13:00+0200\n"
"PO-Revision-Date: 2016-11-03 13:59+0100\n"
"Last-Translator: \n"
"Language-Team: \n"
"Language: zh_Hans\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"Last-Translator: \n"
"Language-Team: \n"
"X-Generator: Poedit 1.8.7\n"
#: templates/roughage/nutrition.html:24 templates/roughage/nutrition.html:27
msgid "Roughage nutrition model"
msgstr "粗粮营养模型"
#: templates/roughage/nutrition.html:60
#: templates/roughage/nutrition.html:72
msgid "Soil type"
msgstr "土壤类型"
#: templates/roughage/nutrition.html:70
#: templates/roughage/nutrition.html:82
msgid "Clover share"
msgstr "苜蓿共享"
#: templates/roughage/nutrition.html:80
#: templates/roughage/nutrition.html:92
msgid "First harvest date"
msgstr "第一次收获日期"
#: templates/roughage/nutrition.html:85
#: templates/roughage/nutrition.html:97
msgid "Second harvest date"
msgstr "第二次收获日期"
#: templates/roughage/nutrition.html:107
#: templates/roughage/nutrition.html:119
msgid "Use weather scenarios"
msgstr "使用天气情景"
#: templates/roughage/nutrition.html:110
#: templates/roughage/nutrition.html:122
msgid "Mean daily temperature"
msgstr "日均温"
#: templates/roughage/nutrition.html:119
#: templates/roughage/nutrition.html:131
msgid "Daily precipitation"
msgstr "日降水量"
#: templates/roughage/nutrition.html:128
#: templates/roughage/nutrition.html:140
msgid "Daily global radiation"
msgstr "日全球辐射"
#: templates/roughage/nutrition.html:142
#: templates/roughage/nutrition.html:154
msgid "Add artificial watering"
msgstr "人工加水"
#: templates/roughage/nutrition.html:197 templates/roughage/nutrition.html:259
#: templates/roughage/nutrition.html:164
msgid "Delete matrix contents"
msgstr ""
#: templates/roughage/nutrition.html:212 templates/roughage/nutrition.html:274
msgid "Time of day"
msgstr "一天中的时间"
#: templates/roughage/nutrition.html:209 templates/roughage/nutrition.html:271
#: templates/roughage/nutrition.html:224 templates/roughage/nutrition.html:286
msgid "Harvest width"
msgstr "收获的宽度"
#: templates/roughage/nutrition.html:216 templates/roughage/nutrition.html:278
#: templates/roughage/nutrition.html:231 templates/roughage/nutrition.html:293
msgid "Estimated harvest"
msgstr "估算的收获"
#: templates/roughage/nutrition.html:225 templates/roughage/nutrition.html:287
#: templates/roughage/nutrition.html:240 templates/roughage/nutrition.html:302
msgid "Conditioning"
msgstr "情形"
#: templates/roughage/nutrition.html:227 templates/roughage/nutrition.html:289
#: templates/roughage/nutrition.html:242 templates/roughage/nutrition.html:304
msgid "Weak"
msgstr "弱"
#: templates/roughage/nutrition.html:228 templates/roughage/nutrition.html:290
#: templates/roughage/nutrition.html:243 templates/roughage/nutrition.html:305
msgid "Strong"
msgstr "强"
#: templates/roughage/nutrition.html:229 templates/roughage/nutrition.html:291
#: templates/roughage/nutrition.html:244 templates/roughage/nutrition.html:306
msgid "Crushed"
msgstr "奔溃"
#: templates/roughage/nutrition.html:236 templates/roughage/nutrition.html:298
#: templates/roughage/nutrition.html:251 templates/roughage/nutrition.html:313
msgid "String width"
msgstr "线宽"
#: templates/roughage/nutrition.html:243 templates/roughage/nutrition.html:305
#: templates/roughage/nutrition.html:258 templates/roughage/nutrition.html:320
msgid "Estimated dry matter fraction"
msgstr "估算的干物质组成比例"
#: templates/roughage/nutrition.html:317
#: templates/roughage/nutrition.html:332
msgid "Run model"
msgstr "运行模型"
#: templates/roughage/nutrition.html:321
#: templates/roughage/nutrition.html:336
msgid "Model is running, please wait"
msgstr "模型在运行中，请等候"
#: templates/roughage/nutrition.html:340
#: templates/roughage/nutrition.html:355
msgid "Results"
msgstr "结果"
roughage/templates/roughage/nutrition.html
+ 22
− 0
View file @ aa52b49e
......@@ -160,6 +160,9 @@
og <a href="http://gamlevips.nibio.no/models/mo1004s.jsp?grastype=raigras" target="new">raigras</a>.
<a href="/information/12/#grovformodell_kalibrering" target="new">Les mer om kalibrering</a>
</p>
<div class="form-group">
<button type="button" class="btn btn-danger" onclick="emptyCalibrationForStation()">{% trans "Delete matrix contents" %} <span id="modelRunHourGlass"></span></button>
</div>
<fieldset>
<table id="optimeringstabell" class="table">
<tr>
......@@ -467,5 +470,24 @@
storeLocalSettings({"calibrationForStation":JSON.stringify(calibrationForStation)});
}
};
/**
* Removes all calibration values for a station
*/
var emptyCalibrationForStation = function(){
var theForm = document.getElementById("{{form_id}}");
var weatherStationId = theForm.weatherStationId.selectedIndex >=0 ? theForm.weatherStationId.options[theForm.weatherStationId.selectedIndex].value : "-1";
if(weatherStationId != "-1")
{
for(var i=0; i< calibrationFieldNames.length;i++)
{
var key=calibrationFieldNames[i];
theForm[key].value = "";
storeCalibrationForStation(key,"");
}
}
};
</script>
{% endblock %}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment