Merge branch 'saddlegallmidge-form-idec-372' into 'feature/gridv-6-mapserver-layer'

Saddlegallmidge form idec 372

See merge request !13

VIPSWeb/settings.py

@@ -143,6 +143,7 @@ INSTALLED_APPS = (
     'observations',
     'information',
     'cerealblotchmodels',
+    'ipmd',
     'calculators',
     'roughage',
     'applefruitmoth',

VIPSWeb/urls.py

@@ -58,6 +58,7 @@ else:
         re_path(r'^observations/', include('observations.urls', namespace = "observations")),
         re_path(r'^information/', include('information.urls', namespace = "information")),
         re_path(r'^blotch/', include('cerealblotchmodels.urls', namespace = "cerealblotchmodels")),
+        re_path(r'^ipmd/', include('ipmd.urls', namespace = "ipmd")),
         re_path(r'^calculators/', include('calculators.urls', namespace = "calculators")),
         re_path(r'^roughage/', include('roughage.urls', namespace = "roughage")),
         re_path(r'^security/', include('security.urls', namespace = "security")),

docs/new_model_config.md

@@ -13,7 +13,7 @@ Add a result parameter by clicking as shown below
 ![Click Add to add a new result parameter](./illustrations/add_result_param_1.png "Click Add to add a new result parameter")
 
 The result parameter form is shown below.
-* Namespace = The model ID (dictated by the model)
+* Namespace = The model ID (dictated by the model) or WEATHER (Weather parameters are most times using the WEATHER namespace)
 * Key = The parameter ID (dictated by the model)
 * Name = The parameter name as displayed to users
 * Description = Further description of the parameter (currently not in use)

ipmd/admin.py

+from django.contrib import admin
+
+# Register your models here.

ipmd/apps.py

+from django.apps import AppConfig
+
+
+class IpmdConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'ipmd'

ipmd/models.py

+from django.db import models
+
+# Create your models here.

ipmd/templates/ipmd/index.html

+{% extends "base.html" %}
+{% load static %}
+{% comment %}
+
+#
+# Copyright (c) 2023 NIBIO <http://www.nibio.no/>. 
+# 
+# This file is part of VIPSWeb.
+# VIPSWeb 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.
+# 
+# VIPSWeb 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 VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
+# 
+ 
+{% endcomment %}
+{% load i18n %}
+{% block title%}{% trans "IPM Decisions models" %}{%endblock%}
+{% block content %}
+<h1>{% trans "IPM Decisions models" %}</h1>
+<ul>
+    <li><a href="/ipmd/saddlegallmidge">{% trans "Saddle gall midge" %}</a></li>
+</ul>
+
+{% endblock %}
\ No newline at end of file

ipmd/tests.py

+from django.test import TestCase
+
+# Create your tests here.

ipmd/urls.py

+#
+# Copyright (c) 2023 NIBIO <http://www.nibio.no/>. 
+# 
+# This file is part of VIPSWeb.
+# VIPSWeb 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.
+# 
+# VIPSWeb 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 VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
+# 
+
+from django.urls import re_path
+from ipmd import views
+
+app_name = "ipmd"
+
+urlpatterns = [
+    # ex: /forecasts/                   
+    re_path(r'^$', views.index, name='index'),
+    re_path(r'saddlegallmidge/', views.saddlegallmidgeform, name='saddlegallmidgeform')
+]
\ No newline at end of file

ipmd/views.py

+from django.shortcuts import render
+
+# Create your views here.
+
+def index(request):
+    context = {}
+    return render(request, 'ipmd/index.html', context)
+
+def saddlegallmidgeform(request):
+    context = {}
+    return render(request, 'ipmd/saddlegallmidgeform.html', context)
\ No newline at end of file