Barkbeetle module alpha-1 first v sent to client

src/main/java/no/nibio/vips/logic/modules/barkbeetle/BarkbeetleController.java

@@ -166,6 +166,7 @@ public class BarkbeetleController extends HttpServlet {
                         : null;
                 if(trapsite != null)
                 {
+                    request.setAttribute("userIsAdmin",SessionControllerGetter.getUserBean().authorizeUser(user, VipsLogicRole.BARKBEETLE_ADMIN, VipsLogicRole.SUPERUSER));
                     request.setAttribute("seasonTrapsite", trapsite);
                     Set<Integer> missingWeeks = new HashSet(trapsite.getTrapsiteType().getTrapsiteTypeId().equals(TrapsiteType.TRAPSITE_TYPE_STANDARD)?
                             Arrays.asList(new Integer[]{21,24,28,33})

src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteForm.ftl

@@ -47,6 +47,9 @@
 	<h1><#if seasonTrapsite.seasonTrapsiteId?has_content>Rediger<#else>Ny</#if> fellelokalitet</h1>
 	<p>
 		<a href="/barkbeetle?season=${season}" class="btn btn-default back" role="button">${i18nBundle.back}</a>
+		<#if seasonTrapsite.seasonTrapsiteId?has_content>
+		<a href="/barkbeetle?action=registerData&seasonTrapsiteId=${seasonTrapsite.seasonTrapsiteId}" class="btn btn-default" role="button">Registrer data</a>
+		</#if>
 	</p>
 <div class="singleBlockContainer">
 	<div class="row">

src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteList.ftl

@@ -21,7 +21,7 @@
 </#macro>
 <#macro page_contents>
 <h1>Fellelokaliteter for sesongen ${season}</h1>
-<#if userIsAdmin || user.userId == site.userId.userId>
+<#if userIsAdmin>
 <p>
 	<a href="/barkbeetle?action=editSeasonTrapsite&season=${season}" class="btn btn-default" role="button">${i18nBundle.addNew}</a>
 </p>

src/main/webapp/templates/modules/barkbeetle/barkbeetleTrapsiteRegistrationForm.ftl

@@ -16,14 +16,15 @@
   along with VIPSLogic.  If not, see <http://www.nibio.no/licenses/>.
 	
 --><#include "../../master.ftl">
+<#assign siteName= seasonTrapsite.countyName + "/" + seasonTrapsite.municipalityName + "/" + seasonTrapsite.ownerName>
 <#macro page_head>
-	<title>Barkbilleregistrering: Registrer data for lokalitet X, sesong ${seasonTrapsite.season}</title>
+	<title>Barkbilleregistrering: Registrer data for lokalitet ${siteName}, sesong ${seasonTrapsite.season}</title>
 </#macro>
 <#macro page_contents>
 	<#if messageKey?has_content>
 		<div class="alert alert-success">Data ble lagret ${.now}</div>
 	</#if>
-	<h1>Registrer data for lokalitet X, sesong ${seasonTrapsite.season}</h1>
+	<h1>Registrer data for lokalitet ${siteName}, sesong ${seasonTrapsite.season}</h1>
 	<p>
 		<a href="/barkbeetle?action=editSeasonTrapsite&season=${seasonTrapsite.season}&seasonTrapsiteId=${seasonTrapsite.seasonTrapsiteId}" class="btn btn-default back" role="button">${i18nBundle.back}</a>
 	</p>
@@ -72,14 +73,19 @@
 					<td><input class="form-control" type="number" name="${reg.trapsiteRegistrationPK.week}_trap4_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}_trap4" value="${reg.trap4!"M"}"<#if reg.trapsiteRegistrationPK.week gt currentWeek> disabled="disabled"</#if>/></td>
 					
-					<td rowspan="2"><#if reg.dateRegistration?has_content>
-						<select class="form-control status_${reg.registrationStatusTypeId}" name="${reg.trapsiteRegistrationPK.week}_registrationStatusTypeId" onchange="this.className='form-control status_' + this.options[this.selectedIndex].value;">
-						<#list registrationStatusTypes as registrationStatusType>
-							<option class="status_${registrationStatusType.registrationStatusTypeId}" value="${registrationStatusType.registrationStatusTypeId}"
-							<#if reg.registrationStatusTypeId?has_content && reg.registrationStatusTypeId==registrationStatusType.registrationStatusTypeId>selected="selected"</#if>
-							>${registrationStatusType.title}</option>
-						</#list>
-						</select>
+					<td rowspan="2">
+					<#if reg.dateRegistration?has_content>
+						<#if userIsAdmin>
+							<select class="form-control status_${reg.registrationStatusTypeId}" name="${reg.trapsiteRegistrationPK.week}_registrationStatusTypeId" onchange="this.className='form-control status_' + this.options[this.selectedIndex].value;">
+							<#list registrationStatusTypes as registrationStatusType>
+								<option class="status_${registrationStatusType.registrationStatusTypeId}" value="${registrationStatusType.registrationStatusTypeId}"
+								<#if reg.registrationStatusTypeId?has_content && reg.registrationStatusTypeId==registrationStatusType.registrationStatusTypeId>selected="selected"</#if>
+								>${registrationStatusType.title}</option>
+							</#list>
+							</select>
+						<#else>
+							<#list registrationStatusTypes as registrationStatusType><#if reg.registrationStatusTypeId?has_content && reg.registrationStatusTypeId==registrationStatusType.registrationStatusTypeId><span class="status_${registrationStatusType.registrationStatusTypeId}">${registrationStatusType.title}</span></#if></#list>
+						</#if>
 					</#if></td>
 				</tr>
 				<tr>
@@ -126,13 +132,13 @@
 <#macro custom_css>
 	<link href="//code.jquery.com/ui/1.10.3/themes/redmond/jquery-ui.css" rel="stylesheet" />
 	<style type="text/css">
-		select option[value="1"], select.status_1 {
+		select option[value="1"], select.status_1, span.status_1 {
 			background-color: #ffe066 !important;
 		}
-		select option[value="2"], select.status_2 {
+		select option[value="2"], select.status_2, span.status_2 {
 			background-color: #1aff88 !important;
 		}
-		select option[value="3"], select.status_3 {
+		select option[value="3"], select.status_3, span.status_3 {
 			background-color: #ff6e66 !important;
 		}