Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
V
VIPSWeb
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VIPS
VIPSWeb
Commits
38bb303e
Commit
38bb303e
authored
5 years ago
by
Tor-Einar Skog
Browse files
Options
Downloads
Patches
Plain Diff
Added matrix emptying feature
parent
7a5cbef1
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
roughage/locale/nb/LC_MESSAGES/django.po
+36
-43
36 additions, 43 deletions
roughage/locale/nb/LC_MESSAGES/django.po
roughage/templates/roughage/nutrition.html
+22
-0
22 additions, 0 deletions
roughage/templates/roughage/nutrition.html
with
58 additions
and
43 deletions
roughage/locale/nb/LC_MESSAGES/django.po
+
36
−
43
View file @
38bb303e
...
@@ -3,116 +3,109 @@
...
@@ -3,116 +3,109 @@
# This file is distributed under the same license as the PACKAGE package.
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#
#, fuzzy
msgid ""
msgid ""
msgstr ""
msgstr ""
"Project-Id-Version:
PACKAGE VERSION
\n"
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-01-05 14:07+0100\n"
"POT-Creation-Date: 2020-06-09 13:00+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"PO-Revision-Date: 2020-06-09 13:01+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: nb\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\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:24 templates/roughage/nutrition.html:27
#: templates/roughage/nutrition.html:26
msgid "Roughage nutrition model"
msgid "Roughage nutrition model"
msgstr "Grovfôrmodellen"
msgstr "Grovfôrmodellen"
#: templates/roughage/nutrition.html:
59
#: templates/roughage/nutrition.html:
72
msgid "Soil type"
msgid "Soil type"
msgstr "Jordtype"
msgstr "Jordtype"
#: templates/roughage/nutrition.html:
69
#: templates/roughage/nutrition.html:
82
msgid "Clover share"
msgid "Clover share"
msgstr "Kløverandel"
msgstr "Kløverandel"
#: templates/roughage/nutrition.html:
7
9
#: templates/roughage/nutrition.html:9
2
msgid "First harvest date"
msgid "First harvest date"
msgstr "Dato førsteslått"
msgstr "Dato førsteslått"
#: templates/roughage/nutrition.html:
84
#: templates/roughage/nutrition.html:
97
msgid "Second harvest date"
msgid "Second harvest date"
msgstr "Dato andreslått"
msgstr "Dato andreslått"
#: templates/roughage/nutrition.html:89
#: templates/roughage/nutrition.html:119
msgid "Run model"
msgstr "Kjør modell"
#: templates/roughage/nutrition.html:108
msgid "Use weather scenarios"
msgid "Use weather scenarios"
msgstr "Bruk værscenarier"
msgstr "Bruk værscenarier"
#: templates/roughage/nutrition.html:1
11
#: templates/roughage/nutrition.html:1
22
msgid "Mean daily temperature"
msgid "Mean daily temperature"
msgstr "Middeltemperatur pr. døgn"
msgstr "Middeltemperatur pr. døgn"
#: templates/roughage/nutrition.html:1
20
#: templates/roughage/nutrition.html:1
31
msgid "Daily precipitation"
msgid "Daily precipitation"
msgstr "Nedbør pr. døgn"
msgstr "Nedbør pr. døgn"
#: templates/roughage/nutrition.html:1
29
#: templates/roughage/nutrition.html:1
40
msgid "Daily global radiation"
msgid "Daily global radiation"
msgstr "Globalstråling pr. døgn"
msgstr "Globalstråling pr. døgn"
#: templates/roughage/nutrition.html:14
3
#: templates/roughage/nutrition.html:1
5
4
msgid "Add artificial watering"
msgid "Add artificial watering"
msgstr "Legg til vanning"
msgstr "Legg til vanning"
#: templates/roughage/nutrition.html:193
#: templates/roughage/nutrition.html:164
#: templates/roughage/nutrition.html:255
msgid "Delete matrix contents"
msgstr "Tøm matrise for kalibreringsverdier"
#: templates/roughage/nutrition.html:212 templates/roughage/nutrition.html:274
msgid "Time of day"
msgid "Time of day"
msgstr "Klokkeslett"
msgstr "Klokkeslett"
#: templates/roughage/nutrition.html:205
#: templates/roughage/nutrition.html:224 templates/roughage/nutrition.html:286
#: templates/roughage/nutrition.html:267
msgid "Harvest width"
msgid "Harvest width"
msgstr "Slåttebredde"
msgstr "Slåttebredde"
#: templates/roughage/nutrition.html:212
#: templates/roughage/nutrition.html:231 templates/roughage/nutrition.html:293
#: templates/roughage/nutrition.html:274
msgid "Estimated harvest"
msgid "Estimated harvest"
msgstr "Estimert avling"
msgstr "Estimert avling"
#: templates/roughage/nutrition.html:221
#: templates/roughage/nutrition.html:240 templates/roughage/nutrition.html:302
#: templates/roughage/nutrition.html:283
msgid "Conditioning"
msgid "Conditioning"
msgstr "Kondisjonering"
msgstr "Kondisjonering"
#: templates/roughage/nutrition.html:223
#: templates/roughage/nutrition.html:242 templates/roughage/nutrition.html:304
#: templates/roughage/nutrition.html:285
msgid "Weak"
msgid "Weak"
msgstr "Svak"
msgstr "Svak"
#: templates/roughage/nutrition.html:224
#: templates/roughage/nutrition.html:243 templates/roughage/nutrition.html:305
#: templates/roughage/nutrition.html:286
msgid "Strong"
msgid "Strong"
msgstr "Sterk"
msgstr "Sterk"
#: templates/roughage/nutrition.html:225
#: templates/roughage/nutrition.html:244 templates/roughage/nutrition.html:306
#: templates/roughage/nutrition.html:287
msgid "Crushed"
msgid "Crushed"
msgstr "Knust"
msgstr "Knust"
#: templates/roughage/nutrition.html:232
#: templates/roughage/nutrition.html:251 templates/roughage/nutrition.html:313
#: templates/roughage/nutrition.html:294
msgid "String width"
msgid "String width"
msgstr "Strengbredde"
msgstr "Strengbredde"
#: templates/roughage/nutrition.html:239
#: templates/roughage/nutrition.html:258 templates/roughage/nutrition.html:320
#: templates/roughage/nutrition.html:301
msgid "Estimated dry matter fraction"
msgid "Estimated dry matter fraction"
msgstr "Anslått tørrstoffprosent"
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"
msgid "Model is running, please wait"
msgstr "Modellen kjører, vennligst vent"
msgstr "Modellen kjører, vennligst vent"
#: templates/roughage/nutrition.html:3
33
#: templates/roughage/nutrition.html:3
55
msgid "Results"
msgid "Results"
msgstr "Resultater"
msgstr "Resultater"
This diff is collapsed.
Click to expand it.
roughage/templates/roughage/nutrition.html
+
22
−
0
View file @
38bb303e
...
@@ -160,6 +160,9 @@
...
@@ -160,6 +160,9 @@
og
<a
href=
"http://gamlevips.nibio.no/models/mo1004s.jsp?grastype=raigras"
target=
"new"
>
raigras
</a>
.
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>
<a
href=
"/information/12/#grovformodell_kalibrering"
target=
"new"
>
Les mer om kalibrering
</a>
</p>
</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>
<fieldset>
<table
id=
"optimeringstabell"
class=
"table"
>
<table
id=
"optimeringstabell"
class=
"table"
>
<tr>
<tr>
...
@@ -462,5 +465,24 @@
...
@@ -462,5 +465,24 @@
storeLocalSettings
({
"
calibrationForStation
"
:
JSON
.
stringify
(
calibrationForStation
)});
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>
</script>
{% endblock %}
{% endblock %}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment