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

Adding input check: number OR M, but not a combo

parent bb7d73d8
No related branches found
No related tags found
No related merge requests found
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
</#if> </#if>
<div class="singleBlockContainer"> <div class="singleBlockContainer">
<div class="row"> <div class="row">
<form id="trapsiteRegistrationForm" action="/barkbeetle?action=trapsiteRegistrationFormSubmit" method="post"> <form id="trapsiteRegistrationForm" action="/barkbeetle?action=trapsiteRegistrationFormSubmit" method="post" onsubmit="try{ return validateForm(this);}catch(e){console.info(e);return false;}">
<input type="hidden" name="seasonTrapsiteId" value="${seasonTrapsite.seasonTrapsiteId}"/> <input type="hidden" name="seasonTrapsiteId" value="${seasonTrapsite.seasonTrapsiteId}"/>
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
<td rowspan="2">${reg.trapsiteRegistrationPK.week} (${reg?counter})</td> <td rowspan="2">${reg.trapsiteRegistrationPK.week} (${reg?counter})</td>
<td rowspan="2"><input class="form-control" type="date" name="${reg.trapsiteRegistrationPK.week}_dateRegistration" value="${reg.dateRegistration!""}"<#if reg.trapsiteRegistrationPK.week gt currentWeek> disabled="disabled"<#else> required="required"</#if>/></td> <td rowspan="2"><input class="form-control" type="date" name="${reg.trapsiteRegistrationPK.week}_dateRegistration" value="${reg.dateRegistration!""}"<#if reg.trapsiteRegistrationPK.week gt currentWeek> disabled="disabled"<#else> required="required"</#if>/></td>
<td><input class="form-control" type="number" name="${reg.trapsiteRegistrationPK.week}_trap1_ml" onblur="setCalculatedAmount(this);" value=""<#if reg.trapsiteRegistrationPK.week gt currentWeek> disabled="disabled"</#if>/></td> <td><input class="form-control" type="number" name="${reg.trapsiteRegistrationPK.week}_trap1_ml" onblur="setCalculatedAmount(this);" value=""<#if reg.trapsiteRegistrationPK.week gt currentWeek> disabled="disabled"</#if>/></td>
<td><input class="form-control" type="text" name="${reg.trapsiteRegistrationPK.week}_trap1" value="${reg.trap1!"M"}"<#if reg.trapsiteRegistrationPK.week gt currentWeek> disabled="disabled"</#if>/></td> <td><input class="form-control" type="text" onblur="validateRegField(this, true);" name="${reg.trapsiteRegistrationPK.week}_trap1" value="${reg.trap1!"M"}"<#if reg.trapsiteRegistrationPK.week gt currentWeek> disabled="disabled"</#if>/></td>
<td><input class="form-control" type="number" name="${reg.trapsiteRegistrationPK.week}_trap2_ml" onblur="setCalculatedAmount(this);" value=""<#if reg.trapsiteRegistrationPK.week gt currentWeek> disabled="disabled"</#if>/></td> <td><input class="form-control" type="number" name="${reg.trapsiteRegistrationPK.week}_trap2_ml" onblur="setCalculatedAmount(this);" value=""<#if reg.trapsiteRegistrationPK.week gt currentWeek> disabled="disabled"</#if>/></td>
<td><input class="form-control" type="text" name="${reg.trapsiteRegistrationPK.week}_trap2" value="${reg.trap2!"M"}"<#if reg.trapsiteRegistrationPK.week gt currentWeek> disabled="disabled"</#if>/></td> <td><input class="form-control" type="text" name="${reg.trapsiteRegistrationPK.week}_trap2" value="${reg.trap2!"M"}"<#if reg.trapsiteRegistrationPK.week gt currentWeek> disabled="disabled"</#if>/></td>
<td><input class="form-control" type="number" name="${reg.trapsiteRegistrationPK.week}_trap3_ml" onblur="setCalculatedAmount(this);" value=""<#if reg.trapsiteRegistrationPK.week gt currentWeek || isExtended> disabled="disabled"</#if>/></td> <td><input class="form-control" type="number" name="${reg.trapsiteRegistrationPK.week}_trap3_ml" onblur="setCalculatedAmount(this);" value=""<#if reg.trapsiteRegistrationPK.week gt currentWeek || isExtended> disabled="disabled"</#if>/></td>
...@@ -179,6 +179,42 @@ ...@@ -179,6 +179,42 @@
} }
} }
function validateForm(theForm){
var weeks = [21,24,28,33];
for(var wi in weeks)
{
for(var i=1;i<=4;i++)
{
var regField = theForm[weeks[wi] + "_trap" + i];
if(!validateRegField(regField,false))
{
alert("FEIL: Registreringsverdi for uke " + weeks[wi] + ", felle nr " + i + " må enten være et tall eller \"M\" for manglende data. ");
return false;
}
}
}
return true;
}
function validateRegField(regField, issueAlert)
{
if(isNaN(regField.value))
{
if(regField.value.trim() != "M")
{
if(issueAlert)
{
alert("FEIL: Registreringsverdi må enten være et tall eller \"M\" for manglende data.");
}
regField.classList.add("validateFalse");
return false;
}
}
regField.classList.remove("validateFalse");
return true;
}
</script> </script>
</#macro> </#macro>
<#macro custom_css> <#macro custom_css>
...@@ -194,6 +230,9 @@ ...@@ -194,6 +230,9 @@
background-color: #ff6e66 !important; background-color: #ff6e66 !important;
} }
input.validateFalse {
border-color: red;
}
</style> </style>
</#macro> </#macro>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment