From c998d8ada3010eed8577fe0939466a2fa517e83d Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Fri, 17 Mar 2023 10:26:28 +0100
Subject: [PATCH] Roughage: Custom growth start calc date [GROVFOR-10]
---
roughage/locale/nb/LC_MESSAGES/django.mo | Bin 1796 -> 1674 bytes
roughage/locale/nb/LC_MESSAGES/django.po | 61 +++++++-----------
roughage/locale/zh_CN/LC_MESSAGES/django.po | 44 +++++++------
roughage/locale/zh_Hans/LC_MESSAGES/django.po | 44 +++++++------
roughage/templates/roughage/nutrition.html | 5 ++
5 files changed, 77 insertions(+), 77 deletions(-)
diff --git a/roughage/locale/nb/LC_MESSAGES/django.mo b/roughage/locale/nb/LC_MESSAGES/django.mo
index 32924f17be89df7eeec90dcbededabb3c5ae037b..a7c227016ca0b5a9916be40884d742d6a7997737 100755
GIT binary patch
delta 726
zcmZqS>*B4yC&V(9fq{WR28#bMFfgbxFfiO<1c@>*6fiL`h%+!S6f!X|@GvkibVBKA
zObiU{3=9m5nHU(v7#J8<Gchm-GcYh5Vq#!WU|?Xl1{MF##K0iSz`(%A%)lVXz`&rx
z%)lVTz`$U~%)r3Qz);T+$jrc?%)r19&kQlBnHi#C7Bj?x9n1_25)2Fs2bdWcI2jli
zZZbnGdJN@%XNEY8k%fVQ4P+4u0|Pe$1A{0F*a8Mc76t}U1_lOw76t|u1_lOK76t|m
z1_lN%76yh8hI$5uU={`j0R{$!6)X^gcCs)q@G&qj9AjZ%U}a!nxXQx7Aj!bMaGM3<
zgRd+QAF{JDFsLvvFlewcFi0^lF!-`EFz_=lFl4Yod|1H>aX>dK1A`_51H(+Hy2Gpx
z{r6ZI7`W;g7#RMuLL9)w262Ei8-%aH263q+RNRRT;vj!Ehz~>AAR&~<2C*=c4dTNZ
zsJ=!v1_n?pf`S_qbxe>L1xFjm!ORSx@P`V5f)?a@E(VC@AYonxh=m|F2!o;l6qFz~
zD2PG9DGlN<K+*^(ltAeS6b&K_5XXbk1SoxgLKLJFlm-|aQ&JQXi%K%nGACy<#YiQV
zq$=d6DWn(WmzQKH6qh6xl_(@9<|LQqY(Bu$$2fUAi^gOp)&vEY#FBi4wEQB4q|~C+
Z^t{ZxbcMt+g|gJ_;u5f?%?nwR837ulN-Y2Y
delta 840
zcmeC;ZQ-lGC&V(9fq{WRnt_2qhJk_M3j+g#Dgy(<8AgyO149B61A{mN14AMc0|O5O
z14AX0ZewC#U}s=pn9Rh$AjZJJFq?^iL70JoVH1>pjER9kmVtrcE)xTTAOi!#Zzcu?
zAqEBpUS<XcUIqpR1!e{YWd??N20dno0YS_V4VlakgWH)I7$g`N82XtR7&sXi7*;St
zEr9ZmF+&`5fti7U4P+5B0|Pe$1H%)j1s|9h7(^Ku82&LcFt9K%Fo>`)FmNz1Fi5g6
zFeorGFetGwFbFWzGcY)_LJSIFWnka~`IMD`ft7)Qp@5ZvL6U)ip^O#cg9)q*3@Qu^
z42xJ97^D~&7>=_tFz_=lFg#*~`0Nua#AmE*3=EnK3=G0-5Oua}3=9ek3=9!$3=CYL
z5M%>c%)rpX#=yW+&%nSi6)LcZ4dTMhAPEKrhCOT$hn!@C`0P9zBxG*0K`eaC2JzW9
zsJ`E93=E)H0|hrIB$yyE2#zL@N0^~}5CsYeuxCL*3-Sd>5EQ>4pM%&S42pLV5Car%
z3=qpeJ_iYb;v5t`pmYNYeo)+ld<TkSP_Tp4fUv;iT&AqeKbYDXGXnf|gHp>fi!<}{
zbX^ilQmqt>42%qP4J>sH%@qudtW3<b4U7y7xO@_eOLRku67!045=-)ntQ5F>67$ka
z6Vp?5LsAoSk@!{$c}ZNpp1!WSVW~wRbFCB%^$aH0v1lea=jWBA=0VL#OD)oM%}dTt
z$;?Z)Qm{zMEa3{sDJ@FO(RIr&$}P51$SVMIi*1dp6(CGojXVWKTLnW+Ypw`g_td=9
bB8Xc8@>5eXOB9Usj3+N+N!+Z#n#2eIs$6tH
diff --git a/roughage/locale/nb/LC_MESSAGES/django.po b/roughage/locale/nb/LC_MESSAGES/django.po
index 37293b62..782d1642 100755
--- a/roughage/locale/nb/LC_MESSAGES/django.po
+++ b/roughage/locale/nb/LC_MESSAGES/django.po
@@ -7,25 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2020-09-17 12:45+0200\n"
-"PO-Revision-Date: 2020-09-17 12:46+0200\n"
-=======
-"POT-Creation-Date: 2020-09-30 10:36+0200\n"
-"PO-Revision-Date: 2020-06-09 13:01+0200\n"
->>>>>>> epleviklerNewFeatures
-"Last-Translator: \n"
-"Language-Team: \n"
-"Language: nb\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2023-03-17 10:04+0100\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-<<<<<<< HEAD
-"X-Generator: Poedit 2.3\n"
-=======
-"X-Generator: Poedit 2.0.6\n"
->>>>>>> epleviklerNewFeatures
#: templates/roughage/nutrition.html:24 templates/roughage/nutrition.html:27
#: templates/roughage/nutrition_calibration.html:23
@@ -41,82 +24,86 @@ msgid "Clover share"
msgstr "Kløverandel"
#: templates/roughage/nutrition.html:92
+msgid "Date of growth start calculation"
+msgstr "Dato for beregning av vekststart"
+
+#: templates/roughage/nutrition.html:97
msgid "First harvest date"
msgstr "Dato førsteslått"
-#: templates/roughage/nutrition.html:97
+#: templates/roughage/nutrition.html:102
msgid "Second harvest date"
msgstr "Dato andreslått"
-#: templates/roughage/nutrition.html:119
+#: templates/roughage/nutrition.html:124
msgid "Use weather scenarios"
msgstr "Bruk værscenarier"
-#: templates/roughage/nutrition.html:122
+#: templates/roughage/nutrition.html:127
msgid "Mean daily temperature"
msgstr "Middeltemperatur pr. døgn"
-#: templates/roughage/nutrition.html:131
+#: templates/roughage/nutrition.html:136
msgid "Daily precipitation"
msgstr "Nedbør pr. døgn"
-#: templates/roughage/nutrition.html:140
+#: templates/roughage/nutrition.html:145
msgid "Daily global radiation"
msgstr "Globalstråling pr. døgn"
-#: templates/roughage/nutrition.html:154
+#: templates/roughage/nutrition.html:159
msgid "Add artificial watering"
msgstr "Legg til vanning"
-#: templates/roughage/nutrition.html:164
+#: templates/roughage/nutrition.html:169
msgid "Delete matrix contents"
msgstr "Tøm matrise for kalibreringsverdier"
-#: templates/roughage/nutrition.html:212 templates/roughage/nutrition.html:274
+#: templates/roughage/nutrition.html:222 templates/roughage/nutrition.html:284
msgid "Time of day"
msgstr "Klokkeslett"
-#: templates/roughage/nutrition.html:224 templates/roughage/nutrition.html:286
+#: templates/roughage/nutrition.html:234 templates/roughage/nutrition.html:296
msgid "Harvest width"
msgstr "Slåttebredde"
-#: templates/roughage/nutrition.html:231 templates/roughage/nutrition.html:293
+#: templates/roughage/nutrition.html:241 templates/roughage/nutrition.html:303
msgid "Estimated harvest"
msgstr "Estimert avling"
-#: templates/roughage/nutrition.html:240 templates/roughage/nutrition.html:302
+#: templates/roughage/nutrition.html:250 templates/roughage/nutrition.html:312
msgid "Conditioning"
msgstr "Kondisjonering"
-#: templates/roughage/nutrition.html:242 templates/roughage/nutrition.html:304
+#: templates/roughage/nutrition.html:252 templates/roughage/nutrition.html:314
msgid "Weak"
msgstr "Svak"
-#: templates/roughage/nutrition.html:243 templates/roughage/nutrition.html:305
+#: templates/roughage/nutrition.html:253 templates/roughage/nutrition.html:315
msgid "Strong"
msgstr "Sterk"
-#: templates/roughage/nutrition.html:244 templates/roughage/nutrition.html:306
+#: templates/roughage/nutrition.html:254 templates/roughage/nutrition.html:316
msgid "Crushed"
msgstr "Knust"
-#: templates/roughage/nutrition.html:251 templates/roughage/nutrition.html:313
+#: templates/roughage/nutrition.html:261 templates/roughage/nutrition.html:323
msgid "String width"
msgstr "Strengbredde"
-#: templates/roughage/nutrition.html:258 templates/roughage/nutrition.html:320
+#: templates/roughage/nutrition.html:268 templates/roughage/nutrition.html:330
msgid "Estimated dry matter fraction"
msgstr "Anslått tørrstoffprosent"
-#: templates/roughage/nutrition.html:332
+#: templates/roughage/nutrition.html:342
msgid "Run model"
msgstr "Kjør modell"
-#: templates/roughage/nutrition.html:336
+#: templates/roughage/nutrition.html:346
msgid "Model is running, please wait"
msgstr "Modellen kjører, vennligst vent"
-#: templates/roughage/nutrition.html:355
+#: templates/roughage/nutrition.html:365
msgid "Results"
msgstr "Resultater"
diff --git a/roughage/locale/zh_CN/LC_MESSAGES/django.po b/roughage/locale/zh_CN/LC_MESSAGES/django.po
index 1cfececd..9497c578 100755
--- a/roughage/locale/zh_CN/LC_MESSAGES/django.po
+++ b/roughage/locale/zh_CN/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-17 12:45+0200\n"
+"POT-Creation-Date: 2023-03-17 09:58+0100\n"
"PO-Revision-Date: 2016-11-03 13:59+0100\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -32,82 +32,86 @@ msgid "Clover share"
msgstr "苜蓿共享"
#: templates/roughage/nutrition.html:92
+msgid "Date of growth start calculation"
+msgstr ""
+
+#: templates/roughage/nutrition.html:97
msgid "First harvest date"
msgstr "第一次收获日期"
-#: templates/roughage/nutrition.html:97
+#: templates/roughage/nutrition.html:102
msgid "Second harvest date"
msgstr "第二次收获日期"
-#: templates/roughage/nutrition.html:119
+#: templates/roughage/nutrition.html:124
msgid "Use weather scenarios"
msgstr "使用天气情景"
-#: templates/roughage/nutrition.html:122
+#: templates/roughage/nutrition.html:127
msgid "Mean daily temperature"
msgstr "日均温"
-#: templates/roughage/nutrition.html:131
+#: templates/roughage/nutrition.html:136
msgid "Daily precipitation"
msgstr "日降水量"
-#: templates/roughage/nutrition.html:140
+#: templates/roughage/nutrition.html:145
msgid "Daily global radiation"
msgstr "日全球辐射"
-#: templates/roughage/nutrition.html:154
+#: templates/roughage/nutrition.html:159
msgid "Add artificial watering"
msgstr "人工加水"
-#: templates/roughage/nutrition.html:164
+#: templates/roughage/nutrition.html:169
msgid "Delete matrix contents"
msgstr ""
-#: templates/roughage/nutrition.html:212 templates/roughage/nutrition.html:274
+#: templates/roughage/nutrition.html:222 templates/roughage/nutrition.html:284
msgid "Time of day"
msgstr "一天中的时间"
-#: templates/roughage/nutrition.html:224 templates/roughage/nutrition.html:286
+#: templates/roughage/nutrition.html:234 templates/roughage/nutrition.html:296
msgid "Harvest width"
msgstr "收获的宽度"
-#: templates/roughage/nutrition.html:231 templates/roughage/nutrition.html:293
+#: templates/roughage/nutrition.html:241 templates/roughage/nutrition.html:303
msgid "Estimated harvest"
msgstr "估算的收获"
-#: templates/roughage/nutrition.html:240 templates/roughage/nutrition.html:302
+#: templates/roughage/nutrition.html:250 templates/roughage/nutrition.html:312
msgid "Conditioning"
msgstr "情形"
-#: templates/roughage/nutrition.html:242 templates/roughage/nutrition.html:304
+#: templates/roughage/nutrition.html:252 templates/roughage/nutrition.html:314
msgid "Weak"
msgstr "弱"
-#: templates/roughage/nutrition.html:243 templates/roughage/nutrition.html:305
+#: templates/roughage/nutrition.html:253 templates/roughage/nutrition.html:315
msgid "Strong"
msgstr "强"
-#: templates/roughage/nutrition.html:244 templates/roughage/nutrition.html:306
+#: templates/roughage/nutrition.html:254 templates/roughage/nutrition.html:316
msgid "Crushed"
msgstr "奔溃"
-#: templates/roughage/nutrition.html:251 templates/roughage/nutrition.html:313
+#: templates/roughage/nutrition.html:261 templates/roughage/nutrition.html:323
msgid "String width"
msgstr "线宽"
-#: templates/roughage/nutrition.html:258 templates/roughage/nutrition.html:320
+#: templates/roughage/nutrition.html:268 templates/roughage/nutrition.html:330
msgid "Estimated dry matter fraction"
msgstr "估算的干物质组成比例"
-#: templates/roughage/nutrition.html:332
+#: templates/roughage/nutrition.html:342
msgid "Run model"
msgstr "运行模型"
-#: templates/roughage/nutrition.html:336
+#: templates/roughage/nutrition.html:346
msgid "Model is running, please wait"
msgstr "模型在运行中，请等候"
-#: templates/roughage/nutrition.html:355
+#: templates/roughage/nutrition.html:365
msgid "Results"
msgstr "结果"
diff --git a/roughage/locale/zh_Hans/LC_MESSAGES/django.po b/roughage/locale/zh_Hans/LC_MESSAGES/django.po
index 5116c463..a6158c74 100755
--- a/roughage/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/roughage/locale/zh_Hans/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-17 12:45+0200\n"
+"POT-Creation-Date: 2023-03-17 09:58+0100\n"
"PO-Revision-Date: 2016-11-03 13:59+0100\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -32,82 +32,86 @@ msgid "Clover share"
msgstr "苜蓿共享"
#: templates/roughage/nutrition.html:92
+msgid "Date of growth start calculation"
+msgstr ""
+
+#: templates/roughage/nutrition.html:97
msgid "First harvest date"
msgstr "第一次收获日期"
-#: templates/roughage/nutrition.html:97
+#: templates/roughage/nutrition.html:102
msgid "Second harvest date"
msgstr "第二次收获日期"
-#: templates/roughage/nutrition.html:119
+#: templates/roughage/nutrition.html:124
msgid "Use weather scenarios"
msgstr "使用天气情景"
-#: templates/roughage/nutrition.html:122
+#: templates/roughage/nutrition.html:127
msgid "Mean daily temperature"
msgstr "日均温"
-#: templates/roughage/nutrition.html:131
+#: templates/roughage/nutrition.html:136
msgid "Daily precipitation"
msgstr "日降水量"
-#: templates/roughage/nutrition.html:140
+#: templates/roughage/nutrition.html:145
msgid "Daily global radiation"
msgstr "日全球辐射"
-#: templates/roughage/nutrition.html:154
+#: templates/roughage/nutrition.html:159
msgid "Add artificial watering"
msgstr "人工加水"
-#: templates/roughage/nutrition.html:164
+#: templates/roughage/nutrition.html:169
msgid "Delete matrix contents"
msgstr ""
-#: templates/roughage/nutrition.html:212 templates/roughage/nutrition.html:274
+#: templates/roughage/nutrition.html:222 templates/roughage/nutrition.html:284
msgid "Time of day"
msgstr "一天中的时间"
-#: templates/roughage/nutrition.html:224 templates/roughage/nutrition.html:286
+#: templates/roughage/nutrition.html:234 templates/roughage/nutrition.html:296
msgid "Harvest width"
msgstr "收获的宽度"
-#: templates/roughage/nutrition.html:231 templates/roughage/nutrition.html:293
+#: templates/roughage/nutrition.html:241 templates/roughage/nutrition.html:303
msgid "Estimated harvest"
msgstr "估算的收获"
-#: templates/roughage/nutrition.html:240 templates/roughage/nutrition.html:302
+#: templates/roughage/nutrition.html:250 templates/roughage/nutrition.html:312
msgid "Conditioning"
msgstr "情形"
-#: templates/roughage/nutrition.html:242 templates/roughage/nutrition.html:304
+#: templates/roughage/nutrition.html:252 templates/roughage/nutrition.html:314
msgid "Weak"
msgstr "弱"
-#: templates/roughage/nutrition.html:243 templates/roughage/nutrition.html:305
+#: templates/roughage/nutrition.html:253 templates/roughage/nutrition.html:315
msgid "Strong"
msgstr "强"
-#: templates/roughage/nutrition.html:244 templates/roughage/nutrition.html:306
+#: templates/roughage/nutrition.html:254 templates/roughage/nutrition.html:316
msgid "Crushed"
msgstr "奔溃"
-#: templates/roughage/nutrition.html:251 templates/roughage/nutrition.html:313
+#: templates/roughage/nutrition.html:261 templates/roughage/nutrition.html:323
msgid "String width"
msgstr "线宽"
-#: templates/roughage/nutrition.html:258 templates/roughage/nutrition.html:320
+#: templates/roughage/nutrition.html:268 templates/roughage/nutrition.html:330
msgid "Estimated dry matter fraction"
msgstr "估算的干物质组成比例"
-#: templates/roughage/nutrition.html:332
+#: templates/roughage/nutrition.html:342
msgid "Run model"
msgstr "运行模型"
-#: templates/roughage/nutrition.html:336
+#: templates/roughage/nutrition.html:346
msgid "Model is running, please wait"
msgstr "模型在运行中，请等候"
-#: templates/roughage/nutrition.html:355
+#: templates/roughage/nutrition.html:365
msgid "Results"
msgstr "结果"
diff --git a/roughage/templates/roughage/nutrition.html b/roughage/templates/roughage/nutrition.html
index c0d8aea8..9ef0a67e 100755
--- a/roughage/templates/roughage/nutrition.html
+++ b/roughage/templates/roughage/nutrition.html
@@ -88,6 +88,11 @@
</select>
<span class="help-block" id="{{ form_id }}_cloverShare_validation"></span>
</div>
+ <div class="form-group">
+ <label for="firstPossibleGrowthStartDate">{% trans "Date of growth start calculation" %}</label>
+ <input type="date" name="firstPossibleGrowthStartDate" class="form-control" value="{% now "Y" %}-03-01"/>
+ <span class="help-block" id="{{ form_id }}_firstPossibleGrowthStartDate_validation"></span>
+ </div>
<div class="form-group">
<label for="firstHarvest">{% trans "First harvest date" %}</label>
<input type="date" name="firstHarvest" class="form-control"/>
--
GitLab