Adding run tasks manually function for organization admins

src/main/java/no/nibio/vips/logic/controller/servlet/SchedulingController.java

@@ -129,9 +129,9 @@ public class SchedulingController extends HttpServlet {
         // Authorization: SUPERUSER ONLY
         else if(action.equals("viewAllTasks"))
         {
-            if(userBean.authorizeUser(user, VipsLogicRole.SUPERUSER))
+            if(userBean.authorizeUser(user, VipsLogicRole.SUPERUSER, VipsLogicRole.ORGANIZATION_ADMINISTRATOR))
             {
-                List<VipsLogicTask> allTasks = schedulingBean.getAllVipsLogicTasks();
+                List<VipsLogicTask> allTasks = schedulingBean.getVipsLogicTasks(user);
                 request.setAttribute("tasks", allTasks);
                 // If this is a redirect from a controller, with a message to be passed on
                 request.setAttribute("messageKey", request.getParameter("messageKey"));
@@ -147,12 +147,16 @@ public class SchedulingController extends HttpServlet {
         // Authorization: SUPERUSER ONLY
         else if(action.equals("runTaskManuallyForm"))
         {
-            if(userBean.authorizeUser(user, VipsLogicRole.SUPERUSER))
+            if(userBean.authorizeUser(user, VipsLogicRole.SUPERUSER, VipsLogicRole.ORGANIZATION_ADMINISTRATOR))
             {
                 try
                 {
                     Integer factoryId = Integer.valueOf(request.getParameter("factoryId"));
                     VipsLogicTask task = VipsLogicTaskFactory.createVipsLogicTask(factoryId);
+                    if(!user.isSuperUser()) // Some tasks need organization id set to create a sensible form for an orgAdmin
+                    {
+                        task.setOrganization(user.getOrganizationId());
+                    }
                     request.setAttribute("vipsLogicTask", task);
                     //request.setAttribute("testJSON", task.getConfigFormDefinition());
                     String language = SessionLocaleUtil.getCurrentLocale(request).getLanguage();
@@ -176,7 +180,7 @@ public class SchedulingController extends HttpServlet {
         // Authorization: SUPERUSER ONLY
         else if(action.equals("runTaskManuallyFormSubmit"))
         {
-            if(userBean.authorizeUser(user, VipsLogicRole.SUPERUSER))
+            if(userBean.authorizeUser(user, VipsLogicRole.SUPERUSER, VipsLogicRole.ORGANIZATION_ADMINISTRATOR))
             {
                 try
                 {
@@ -189,6 +193,10 @@ public class SchedulingController extends HttpServlet {
                         // Need to copy the ParameterMap (not just pass it along), as the values get lost 
                         // after the servlet disconnects itself from the task
                         task.setConfiguration(new HashMap<>(request.getParameterMap()));
+                        if(user.isOrganizationAdmin())
+                        {
+                            task.setOrganization(user.getOrganizationId());
+                        }
                         // If system scheduler is running, launch task there
                         if(schedulingBean.getSystemScheduler().isStarted())
                         {

src/main/java/no/nibio/vips/logic/controller/session/SchedulingBean.java

@@ -334,9 +334,22 @@ public class SchedulingBean {
         
     }
     
-    public List<VipsLogicTask> getAllVipsLogicTasks()
+    public List<VipsLogicTask> getVipsLogicTasks(VipsLogicUser user)
     {
-        return VipsLogicTaskFactory.getAllVipsLogicTasks();
+        // Super User
+        if(user.isSuperUser())
+        {
+            return VipsLogicTaskFactory.getAllVipsLogicTasks();
+        }
+        // Organization admin
+        else if(user.isOrganizationAdmin())
+        {
+            return VipsLogicTaskFactory.getOrganizationAdminVipsLogicTasks();
+        }
+        else
+        {
+            return null;
+        }
     }
     
     public ManagerResource getManagerResource()

src/main/java/no/nibio/vips/logic/scheduling/VipsLogicTaskFactory.java

@@ -24,6 +24,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import no.nibio.vips.logic.scheduling.tasks.DeleteAllExpiredUserUuidsTask;
+import no.nibio.vips.logic.scheduling.tasks.RunAllForecastConfigurationsForOrganizationTask;
 import no.nibio.vips.logic.scheduling.tasks.RunAllForecastConfigurationsTask;
 import no.nibio.vips.logic.scheduling.tasks.SendForecastEventNotificationsTask;
 import no.nibio.vips.logic.scheduling.tasks.UpdateForecastResultCacheTableTask;
@@ -32,7 +33,7 @@ import no.nibio.vips.logic.scheduling.tasks.UpdateModelInformationTask;
 
 /**
  * Provides the requested VipsLogicTask
- * @copyright 2013-2015 <a href="http://www.nibio.no/">NIBIO</a>
+ * @copyright 2013-2017 <a href="http://www.nibio.no/">NIBIO</a>
  * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
  */
 public class VipsLogicTaskFactory {
@@ -43,10 +44,14 @@ public class VipsLogicTaskFactory {
     public static final int UPDATE_FORECAST_SUMMARY_TABLE_TASK = 4;
     public static final int DELETE_ALL_EXPIRED_UUIDS_TASK = 5;
     public static final int SEND_FORECAST_EVENT_NOTIFICATIONS_TASK = 6;
+    public static final int RUN_ALL_FORECAST_CONFIGURATIONS_FOR_ORGANIZATION_TASK = 7;
     
-    private final static int[] ALL_TASK_IDS = {1,2,3,4,5,6};
+    private final static int[] ALL_TASK_IDS = {1,2,3,4,5,6,7};
+    
+    private final static int[] ORGANIZATION_ADMIN_TASK_IDS = {7};
     
     private static List<VipsLogicTask> allTasksList;
+    private static List<VipsLogicTask> organizationAdminTasksList;
     private static Map<String,VipsLogicTask> allTasksMap;
     
     /**
@@ -77,6 +82,9 @@ public class VipsLogicTaskFactory {
             case SEND_FORECAST_EVENT_NOTIFICATIONS_TASK:
                 retVal =  new SendForecastEventNotificationsTask();
                 break;
+            case RUN_ALL_FORECAST_CONFIGURATIONS_FOR_ORGANIZATION_TASK:
+                retVal =  new RunAllForecastConfigurationsForOrganizationTask();
+                break;
             default:
                 return null;
         }
@@ -116,4 +124,16 @@ public class VipsLogicTaskFactory {
         }
         return allTasksMap;
     }
+
+    public static List<VipsLogicTask> getOrganizationAdminVipsLogicTasks() {
+        if(organizationAdminTasksList == null)
+        {
+            organizationAdminTasksList = new ArrayList<>();
+            for(int i:ORGANIZATION_ADMIN_TASK_IDS)
+            {
+                organizationAdminTasksList.add(createVipsLogicTask(i));
+            }
+        }
+        return organizationAdminTasksList;
+    }
 }

src/main/java/no/nibio/vips/logic/scheduling/tasks/RunAllForecastConfigurationsForOrganizationTask.java

+/*
+ * Copyright (c) 2017 NIBIO <http://www.nibio.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the NIBIO Open Source License as published by 
+ * NIBIO, either version 1 of the License, or (at your option) any
+ * later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * NIBIO Open Source License for more details.
+ * 
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSLogic.  If not, see <http://www.nibio.no/licenses/>.
+ * 
+ */
+
+package no.nibio.vips.logic.scheduling.tasks;
+
+import it.sauronsoftware.cron4j.TaskExecutionContext;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import no.nibio.vips.i18n.I18nImpl;
+import no.nibio.vips.logic.entity.ForecastConfiguration;
+import no.nibio.vips.logic.entity.Organization;
+import no.nibio.vips.logic.entity.PointOfInterest;
+import no.nibio.vips.logic.entity.PointOfInterestWeatherStation;
+import no.nibio.vips.logic.scheduling.SchedulingUtil;
+import no.nibio.vips.logic.scheduling.VipsLogicTaskFactory;
+import no.nibio.vips.logic.scheduling.model.PreprocessorException;
+import no.nibio.vips.logic.util.RunModelException;
+import no.nibio.vips.logic.util.SessionControllerGetter;
+import no.nibio.vips.logic.util.SystemTime;
+import no.nibio.web.forms.FormField;
+
+/**
+ * @copyright 2017 <a href="http://www.nibio.no/">NIBIO</a>
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
+ */
+public class RunAllForecastConfigurationsForOrganizationTask extends RunAllForecastConfigurationsTask{
+    private I18nImpl i18n;
+    //private boolean DEBUG=true;
+    @Override
+    public void execute(TaskExecutionContext tec) throws RuntimeException {
+        Integer weatherStationPointOfInterestId = null;
+        if(this.getConfiguration() != null && this.getConfiguration().get("weatherStationPointOfInterestId") != null)
+        { 
+            weatherStationPointOfInterestId =  Integer.valueOf(this.getConfiguration().get("weatherStationPointOfInterestId")[0]);
+        }
+        
+        
+        tec.setCompleteness(0d);
+        int totalNumberofForecastConfigurations = 0;
+        int numberOfCompletedForecastConfigurations = 0;
+        StringBuilder errorMessage = new StringBuilder();
+        // Get all organizations, loop, get all current forecasts, loop, run models, store results
+        boolean noForecastConfigurationsFound = true;
+
+        List<ForecastConfiguration> currentForecastConfigurations = SessionControllerGetter.getForecastBean().getForecastConfigurationsValidAtTime(this.getOrganization(), SystemTime.getSystemTime());
+        //System.out.println("Current forecasts for " + organization.getOrganizationName() + ":" + currentForecastConfigurations.size());
+        if(currentForecastConfigurations != null && !currentForecastConfigurations.isEmpty())
+        {
+            noForecastConfigurationsFound = false;
+            for(ForecastConfiguration forecastConfiguration:currentForecastConfigurations)
+            {
+                if(
+                        weatherStationPointOfInterestId == null
+                        || weatherStationPointOfInterestId <= 0
+                        || forecastConfiguration.getWeatherStationPointOfInterestId().getPointOfInterestId().equals(weatherStationPointOfInterestId))
+                {
+                    try 
+                    {
+                        totalNumberofForecastConfigurations++;
+                        SessionControllerGetter.getForecastBean().runForecast(forecastConfiguration);
+                        /*
+                        if(DEBUG && totalNumberofForecastConfigurations == 2)
+                        {
+                            throw new RunModelException("This is a test!!!");
+                        }*/
+                        numberOfCompletedForecastConfigurations++;
+                        //System.out.println("All went well");
+                    }
+                    catch (PreprocessorException | RunModelException ex) 
+                    {
+                        errorMessage
+                                .append(
+                                    SchedulingUtil.createSchedulingMessageHTML(
+                                        "Error with forecast #" + forecastConfiguration.getForecastConfigurationId(), 
+                                        ex.getMessage(), 
+                                        SchedulingUtil.MESSAGE_STATUS_DANGER)
+                                );
+                        //System.out.println("Error caught");
+                        continue;
+                    }
+
+                }
+
+                double completeness = (double) numberOfCompletedForecastConfigurations/totalNumberofForecastConfigurations;
+                tec.setCompleteness(completeness);
+            }
+        }
+    }
+    
+    /**
+     * 
+     * @return Form definition
+     */
+    @Override
+    public String getConfigFormDefinition(String language) {
+        StringBuilder retVal = new StringBuilder()
+                .append("{")
+                .append("   \"fields\":[")
+                .append("       {")
+                .append("           \"name\":\"factoryId\",")
+                .append("           \"dataType\":\"").append(FormField.DATA_TYPE_INTEGER).append("\",")
+                .append("           \"fieldType\":\"").append(FormField.FIELD_TYPE_HIDDEN).append("\",")
+                .append("           \"webValue\":[\"").append(VipsLogicTaskFactory.RUN_ALL_FORECAST_CONFIGURATIONS_TASK).append("\"]")
+                .append("       },")
+                .append("       {")
+                .append("           \"name\":\"weatherStationPointOfInterestId\",")
+                .append("           \"dataType\":\"").append(FormField.DATA_TYPE_INTEGER).append("\",")
+                .append("           \"fieldType\":\"").append(FormField.FIELD_TYPE_SELECT_SINGLE).append("\",")
+                .append("           \"nullValue\":\"-1\",")
+                .append("           \"required\":false,")
+                .append("           \"options\": [");
+
+        
+        retVal.append("               {\"value\":\"")
+                    .append("-1")
+                    .append("\", \"label\":\"")
+                    .append(this.getI18nImpl().getText("pleaseSelect", language)).append(" ").append(this.getI18nImpl().getText("weatherStationPointOfInterestId", language).toLowerCase())
+                    .append("\",\"selected\":")
+                    .append("false")
+                    .append("}\n");
+        List<PointOfInterestWeatherStation> stations = SessionControllerGetter.getPointOfInterestBean().getWeatherstationsForOrganization(this.getOrganization(), Boolean.TRUE);
+        Collections.sort(stations);
+        for(PointOfInterest station:stations)
+        {
+            retVal.append("               ,{\"value\":\"")
+                    .append(station.getPointOfInterestId())
+                    .append("\", \"label\":\"")
+                    .append(station.getName())
+                    .append("\",\"selected\":")
+                    .append("false")
+                    .append("}\n");
+
+        }
+        retVal  .append("           ]")
+                .append("       }");
+       
+        
+        retVal  .append("           ]")
+                .append("       }");
+                
+
+        return retVal.toString();
+    }
+
+    private I18nImpl getI18nImpl()
+    {
+        if(this.i18n == null)
+        {
+            this.i18n = new I18nImpl("no.nibio.vips.logic.i18n.vipslogictexts");
+        }
+        return this.i18n;
+    }
+    
+}

src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties

@@ -444,3 +444,5 @@ vipsLogicRole_7=Organism editor
 nameAlreadyExists=The name already exists
 loginCredentials=Login credentials
 publicForecasts=Public forecasts
+task_RunAllForecastConfigurationsForOrganizationTask_name=Run all forecasts for one organization
+task_RunAllForecastConfigurationsForOrganizationTask_description=Test

src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties

@@ -444,3 +444,5 @@ vipsLogicRole_7=Organism editor
 nameAlreadyExists=The name already exists
 loginCredentials=Login credentials
 publicForecasts=Public forecasts
+task_RunAllForecastConfigurationsForOrganizationTask_name=Run all forecasts for one organization
+task_RunAllForecastConfigurationsForOrganizationTask_description=Test

src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties

@@ -443,3 +443,5 @@ vipsLogicRole_7=Organism editor
 nameAlreadyExists=The name already exists
 loginCredentials=Login credentials
 publicForecasts=Public forecasts
+task_RunAllForecastConfigurationsForOrganizationTask_name=Run all forecasts for one organization
+task_RunAllForecastConfigurationsForOrganizationTask_description=Test

src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties

@@ -444,3 +444,5 @@ vipsLogicRole_7=Organismeredakt\u00f8r
 nameAlreadyExists=Navnet er allerede i bruk
 loginCredentials=Innloggingsinformasjon
 publicForecasts=Offentlige varsler
+task_RunAllForecastConfigurationsForOrganizationTask_name=Kj\u00f8r alle varsler for en organisasjon
+task_RunAllForecastConfigurationsForOrganizationTask_description=Test

src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties

@@ -444,3 +444,5 @@ vipsLogicRole_7=Organism editor
 nameAlreadyExists=The name already exists
 loginCredentials=Login credentials
 publicForecasts=Public forecasts
+task_RunAllForecastConfigurationsForOrganizationTask_name=Run all forecasts for one organization
+task_RunAllForecastConfigurationsForOrganizationTask_description=Test

src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties

@@ -441,3 +441,5 @@ vipsLogicRole_7=Organism editor
 nameAlreadyExists=The name already exists
 loginCredentials=Login credentials
 publicForecasts=Public forecasts
+task_RunAllForecastConfigurationsForOrganizationTask_name=Run all forecasts for one organization
+task_RunAllForecastConfigurationsForOrganizationTask_description=Test

src/main/webapp/templates/schedulingOverview.ftl

@@ -27,7 +27,7 @@
         <div id="errorMsgEl" class="alert alert-danger" <#if !formValidation?has_content> style="display:none;"</#if>>
 		<#if formValidation?has_content>${formValidation.validationMessages?replace("\n", "<br>")}</#if>
 	</div>
-        <#if user.isSuperUser()>
+        <#if user.isSuperUser() || user.isOrganizationAdmin() >
         <p><a href="/scheduling?action=viewAllTasks">${i18nBundle.viewAllTasks}</a></p>
         </#if>
         <#if messageKey?has_content>