Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
V
VIPSLogic
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
VIPSLogic
Commits
ceb3adc4
Commit
ceb3adc4
authored
4 years ago
by
Tor-Einar Skog
Browse files
Options
Downloads
Patches
Plain Diff
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
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/webapp/templates/modules/barkbeetle/barkbeetleTrapsiteRegistrationForm.ftl
+41
-2
41 additions, 2 deletions
...modules/barkbeetle/barkbeetleTrapsiteRegistrationForm.ftl
with
41 additions
and
2 deletions
src/main/webapp/templates/modules/barkbeetle/barkbeetleTrapsiteRegistrationForm.ftl
+
41
−
2
View file @
ceb3adc4
...
@@ -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
>
...
...
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