diff --git a/cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html b/cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html
index 3920553db5518de5da601f0d92e903e8b17ddbc6..4086fbc136134fcef100aea6850b0ea6ed5d4ce7 100755
--- a/cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html
+++ b/cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html
@@ -47,8 +47,8 @@
font-size: 1.8rem;
font-weight: 500 !important;
}
- .space {
- margin-top: 40px;
+ fieldset {
+ margin-bottom: 40px;
}
</style>
{% endblock %}
@@ -64,94 +64,103 @@
<div class="row">
<div class="col-md-12 mb-3">
<p class="lead">
- <a href="https://www.vips-landbruk.no/forecasts/models/BARLEYNETB/">Elens modell for byggbrunflekk</a> lager en tilvekstkurve for byggbrunflekk med værdata som grunnlag.
- Du kan velge å kjøre modellen med værdata for et vilkårlig punkt i kartet, eller fra en værstasjon. Det er i tillegg nødvendig å legge inn informasjon om angrep av sjukdommen, samt
- sådato, sort, vekstskifte og jordarbeiding. Dersom du har en privat værstasjon som er registrert i Vips, vil denne være tilgjengelig i skjemaet etter <a href="https://logic.vips.nibio.no/login">innlogging</a>.
+ <a href="https://www.vips-landbruk.no/forecasts/models/BARLEYNETB/">Elens modell for byggbrunflekk</a> lager en utviklingskurve for byggbrunflekk med værdata som grunnlag.
+ Du kan velge å kjøre modellen med værdata for et vilkårlig punkt i kartet, eller fra en værstasjon. Det er i tillegg nødvendig å legge inn informasjon om nivået på angrep av sjukdommen, samt
+ sådato, sort, vekstskifte og jordarbeiding. Dersom du har en <a href="https://www.vips-landbruk.no/information/27/">privat værstasjon</a> som er registrert i VIPS, vil denne være tilgjengelig i skjemaet etter <a href="https://logic.vips.nibio.no/login">innlogging</a>.
</p>
</div>
</div>
<div class="row">
<div class="col-md-6">
<input type="hidden" name="timeZone" value="Europe/Oslo"/>
- <div class="form-group">
- <label class="main-label">Jeg vil bruke værdata</label>
- <div class="radio">
- <label>
- <input type="radio" name="weatherDataSourceType" id="grid" value="grid" checked onchange="displayCoordinatesInput()">
- for et spesifikt punkt (koordinater)
- </label>
- <div id="input-coordinates">
- <input type="text" class="form-control" name="latitude" id="latitude" placeholder="Breddegrad" aria-label="Breddegrad">
- <input type="text" class="form-control" name="longitude" id="longitude" placeholder="Lengdegrad" aria-label="Lengdegrad">
- <button type="button" class="btn btn-primary" onclick="openCoordinatesMap()"><i class="fa fa-map-marker fa-lg"></i> Velg i kart</button>
+ <fieldset>
+ <legend>Jeg vil bruke værdata</legend>
+ <div class="form-group">
+ <div class="radio">
+ <label>
+ <input type="radio" name="weatherDataSourceType" id="grid" value="grid" checked onchange="displayCoordinatesInput()">
+ for et spesifikt punkt (koordinater)
+ </label>
+ <div id="input-coordinates">
+ <input type="text" class="form-control" name="latitude" id="latitude" placeholder="Breddegrad" aria-label="Breddegrad">
+ <input type="text" class="form-control" name="longitude" id="longitude" placeholder="Lengdegrad" aria-label="Lengdegrad">
+ <button type="button" class="btn btn-primary" onclick="openCoordinatesMap()"><i class="fa fa-map-marker fa-lg"></i> Velg i kart</button>
+ </div>
+ <div id="coordinates-map" class="map-modal"></div>
</div>
- <div id="coordinates-map" class="map-modal"></div>
- </div>
- <div class="radio">
- <label>
- <input type="radio" name="weatherDataSourceType" id="weatherstation" value="weatherstation" onchange="displayWeatherstationInput()">
- fra en værstasjon
- </label>
- <div id="input-weatherstation" style="display: none;">
- <select name="weatherStationId" id="weatherStationId" class="form-control" onblur="validateField(this);"></select>
- <button type="button" class="btn btn-primary" onclick="openPoiMap()"><i class="fa fa-map-marker fa-lg"></i> Velg i kart</button>
+ <div class="radio">
+ <label>
+ <input type="radio" name="weatherDataSourceType" id="weatherstation" value="weatherstation" onchange="displayWeatherstationInput()">
+ fra en værstasjon
+ </label>
+ <div id="input-weatherstation" style="display: none;">
+ <select name="weatherStationId" id="weatherStationId" class="form-control" onblur="validateField(this);"></select>
+ <button type="button" class="btn btn-primary" onclick="openPoiMap()"><i class="fa fa-map-marker fa-lg"></i> Velg i kart</button>
+ </div>
+ <div id="poi-map" class="map-modal"></div>
</div>
- <div id="poi-map" class="map-modal"></div>
+ <span class="help-block" id="{{ form_id }}_latitude_validation"></span>
+ <span class="help-block" id="{{ form_id }}_weatherStationId_validation"></span>
+ <span class="help-block" id="{{ form_id }}_longitude_validation"></span>
+ </div>
+ </fieldset>
+ <fieldset>
+ <legend>Jeg dyrker</legend>
+ <div class="form-group">
+ <select name="cropOrganismId" id="cropOrganismId" class="form-control" onblur="validateField(this);">
+ </select>
+ <span class="help-block" id="{{ form_id }}_cropOrganismId_validation"></span>
+ </div>
+ <div class="form-group">
+ <label for="sowingDate">{% trans "Sowing date" %}</label>
+ <input type="date" id="sowingDate" name="sowingDate" class="form-control" max="{{max_sowing_date|date:'Y-m-d'}}" onblur="validateField(this);" placeholder="Sådato"/>
+ <span class="help-block" id="{{ form_id }}_sowingDate_validation"></span>
+ </div>
+ <div class="form-group">
+ <label for="sameCropAsLastSeason">Vekstskifte</label><br>
+ <input type="checkbox" id="sameCropAsLastSeason" name="sameCropAsLastSeason"/> Jeg dyrket bygg på samme skifte i fjor<br/>
+ <span class="help-block" id="{{ form_id }}_sameCropAsLastSeason_validation"></span>
+ </div>
+ <div class="form-group">
+ <label for="plowed">Jordarbeiding</label><br>
+ <input type="checkbox" id="plowed" name="plowed"/> Jeg har pløyd<br/>
+ <span class="help-block" id="{{ form_id }}_plowed_validation"></span>
</div>
- <span class="help-block" id="{{ form_id }}_latitude_validation"></span>
- <span class="help-block" id="{{ form_id }}_weatherStationId_validation"></span>
- <span class="help-block" id="{{ form_id }}_longitude_validation"></span>
- </div>
- <div class="form-group space">
- <label class="main-label" for="cropOrganismId">Jeg har dyrket</label>
- <select name="cropOrganismId" id="cropOrganismId" class="form-control" onblur="validateField(this);">
- </select>
- <span class="help-block" id="{{ form_id }}_cropOrganismId_validation"></span>
- </div>
- <div class="form-group">
- <label for="sowingDate">{% trans "Sowing date" %}</label>
- <input type="date" id="sowingDate" name="sowingDate" class="form-control" max="{{max_sowing_date|date:'Y-m-d'}}" onblur="validateField(this);" placeholder="Sådato"/>
- <span class="help-block" id="{{ form_id }}_sowingDate_validation"></span>
- </div>
- <div class="form-group">
- <label for="sameCropAsLastSeason">Vekstskifte</label><br>
- <input type="checkbox" id="sameCropAsLastSeason" name="sameCropAsLastSeason"/> Jeg dyrket bygg på samme skifte i fjor<br/>
- <span class="help-block" id="{{ form_id }}_sameCropAsLastSeason_validation"></span>
- </div>
- <div class="form-group">
- <label for="plowed">Jordarbeiding</label><br>
- <input type="checkbox" id="plowed" name="plowed"/> Jeg har pløyd<br/>
- <span class="help-block" id="{{ form_id }}_plowed_validation"></span>
- </div>
+ </fieldset>
</div>
<div class="col-md-6">
- <div class="form-group">
- <label for="observationDate" class="main-label" for="observationDate">Observasjonsdato</label>
- <input type="date" id="observationDate" name="observationDate" class="form-control"/>
- <span class="help-block" id="{{ form_id }}_observationDate_validation"></span>
- </div>
- <div class="form-group">
- <label for="observationValue">{% trans "% Infected leaves" %}</label>
- <input type="number" id="observationValue" name="observationValue" class="form-control" min="0" max="100"/>
- <span class="help-block" id="{{ form_id }}_observationValue_validation"></span>
- </div>
- <div class="form-group space">
- <label for="sprayingDate" class="main-label">Sprøytedato</label>
- <input type="date" id="sprayingDate" name="sprayingDate" class="form-control"/>
- <span class="help-block" id="{{ form_id }}_sprayingDate_validation"></span>
- </div>
- <div class="form-group">
- <label for="preparationId">med preparat</label>
- <select name="preparationId" id="preparationId" class="form-control">
- </select>
- <span class="help-block" id="{{ form_id }}_preparationId_validation"></span>
- </div>
- <div class="form-group">
- <label for="preparationDose">og preparatdose (ml/daa)</label>
- <input type="number" id="preparationDose" name="preparationDose" class="form-control"/>
- <span class="help-block" id="{{ form_id }}_preparationDose_validation"></span>
- </div>
-
+ <fieldset>
+ <legend>Observasjon</legend>
+ <div class="form-group">
+ <p><i>Legg inn dato og omfang dersom du har observert symptomer</i></p>
+ <input type="date" id="observationDate" name="observationDate" class="form-control"/>
+ <span class="help-block" id="{{ form_id }}_observationDate_validation"></span>
+ </div>
+ <div class="form-group">
+ <label for="observationValue">% blad med symptomer</label>
+ <input type="number" id="observationValue" name="observationValue" class="form-control" min="0" max="100"/>
+ <span class="help-block" id="{{ form_id }}_observationValue_validation"></span>
+ </div>
+ </fieldset>
+ <fieldset>
+ <legend>Sprøyting</legend>
+ <div class="form-group">
+ <p><i>Legg inn dato og detaljer for eventuell siste sprøyting</i></p>
+ <input type="date" id="sprayingDate" name="sprayingDate" class="form-control"/>
+ <span class="help-block" id="{{ form_id }}_sprayingDate_validation"></span>
+ </div>
+ <div class="form-group">
+ <label for="preparationId">med preparat</label>
+ <select name="preparationId" id="preparationId" class="form-control">
+ </select>
+ <span class="help-block" id="{{ form_id }}_preparationId_validation"></span>
+ </div>
+ <div class="form-group">
+ <label for="preparationDose">og preparatdose (ml/daa)</label>
+ <input type="number" id="preparationDose" name="preparationDose" class="form-control"/>
+ <span class="help-block" id="{{ form_id }}_preparationDose_validation"></span>
+ </div>
+ </fieldset>
</div>
</div>
<div class="row">
@@ -469,7 +478,7 @@
statusCode:{
200: function(data,textStatus, jqXHR){
// Building result HTML
- var cropHTML=["<option value=\"-1\">-- {% trans "Select crop" %} --</option>"];
+ var cropHTML=["<option value=\"-1\">-- Velg sort --</option>"];
data.sort(compareOrganisms);
for(var i in data)
{