Merge pull request #148 from gaiaresources/master

Returns and bank dates
dbca-wa · Nov 7, 2016 · 4f5f618 · 4f5f618
2 parents 79dd36a + 99eccf8
commit 4f5f618
Show file tree

Hide file tree

Showing 8 changed files with 464 additions and 59 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -14,7 +14,7 @@ django-countries==3.4.1
 django-cron==0.4.6
 django-dynamic-fixture>=1.9.0
 openpyxl==2.3.5
-datapackage>=0.6.1
+datapackage==0.8.1
 jsontableschema==0.6.5
 python-dateutil==2.5.3
 py4j==0.10.2.1

diff --git a/wildlifelicensing/apps/payments/forms.py b/wildlifelicensing/apps/payments/forms.py
@@ -15,6 +15,12 @@ class PaymentsReportForm(forms.Form):
     end = forms.DateTimeField(required=True, widget=forms.DateTimeInput(
         format=date_format
     ))
+    banked_start = forms.DateTimeField(required=True, widget=forms.DateTimeInput(
+        format=date_format
+    ))
+    banked_end = forms.DateTimeField(required=True, widget=forms.DateTimeInput(
+        format=date_format
+    ))
 
     def __init__(self, *args, **kwargs):
         super(PaymentsReportForm, self).__init__(*args, **kwargs)
@@ -35,5 +41,10 @@ def __init__(self, *args, **kwargs):
         end = today_ten_pm_aest_local + delta
         start = end + relativedelta(weeks=-1)
 
+        banked_start =  (start - datetime.timedelta(days=start.weekday())).replace(hour=0, minute=0)
+        banked_end = (banked_start + datetime.timedelta(days=6)).replace(hour=23, minute=59, second=59)
+
         self.fields['start'].initial = start
         self.fields['end'].initial = end
+        self.fields['banked_start'].initial = banked_start
+        self.fields['banked_end'].initial = banked_end
diff --git a/wildlifelicensing/apps/payments/views.py b/wildlifelicensing/apps/payments/views.py
@@ -89,18 +89,23 @@ def get(self, request):
         if form.is_valid():
             start = form.cleaned_data.get('start')
             end = form.cleaned_data.get('end')
+            banked_start = form.cleaned_data.get('banked_start')
+            banked_end = form.cleaned_data.get('banked_end')
             # here start and end should be timezone aware (with the settings.TIME_ZONE
             start = timezone.make_aware(start) if not timezone.is_aware(start) else start
             end = timezone.make_aware(end) if not timezone.is_aware(end) else end
+            banked_start = timezone.make_aware(banked_start) if not timezone.is_aware(banked_start) else banked_start
+            banked_end = timezone.make_aware(banked_end) if not timezone.is_aware(banked_end) else banked_end
+
             url = request.build_absolute_uri(
                 reverse('payments:ledger-report')
             )
             data = {
                 'system': PAYMENT_SYSTEM_ID,
                 'start': start,
                 'end': end,
-                'banked_start': start,
-                'banked_end': end
+                'banked_start': banked_start,
+                'banked_end': banked_end
             }
             if 'items' in request.GET:
                 data['items'] = True

diff --git a/wildlifelicensing/apps/reports/templates/wl/reports.html b/wildlifelicensing/apps/reports/templates/wl/reports.html
@@ -114,12 +114,18 @@ <h3>Payments</h3>
                 <form method="get" id="payments-form" action="{{ actions.payments }}">
                     {% csrf_token %}
                     <div class="row">
-                        <div class="col-md-4">
+                        <div class="col-md-3">
                             {% bootstrap_field payments_form.start %}
                         </div>
-                        <div class="col-md-4">
+                        <div class="col-md-3">
                             {% bootstrap_field payments_form.end %}
                         </div>
+                        <div class="col-md-3">
+                            {% bootstrap_field payments_form.banked_start %}
+                        </div>
+                        <div class="col-md-3">
+                            {% bootstrap_field payments_form.banked_end %}
+                        </div>
                     </div>
                     <div class="row">
                         <div class="col-md-8">

diff --git a/wildlifelicensing/apps/returns/schemas/regulation17-returns-schema.json b/wildlifelicensing/apps/returns/schemas/regulation17-returns-schema.json
@@ -1,150 +1,177 @@
 {
   "name": "reg-17",
-  "title": "Returns for regulation 17",
   "resources": [
     {
-      "name": "regulation-17",
-      "title": "Regulation 17",
       "path": "",
       "schema": {
         "fields": [
           {
-            "name": "LOCATION",
             "type": "string",
+            "name": "LOCATION",
             "constraints": {
               "required": true
             }
           },
           {
-            "name": "SITE",
             "type": "string",
+            "name": "SITE",
             "constraints": {
               "required": true
             }
           },
           {
-            "name": "DATUM",
-            "type": "string",
             "default": "GDA94",
             "constraints": {
-              "required": true
-            }
+              "required": true,
+              "enum": [
+                "GDA94",
+                "WGS84",
+                "AGD84",
+                "AGD66"
+              ]
+            },
+            "type": "string",
+            "name": "DATUM"
           },
           {
-            "name": "LATITUDE",
             "type": "number",
+            "name": "LATITUDE",
             "constraints": {
-              "required": true,
-              "minimum": -90.0,
-              "maximum": 90.0
+              "minimum": -60.0,
+              "maximum": 0,
+              "required": true
             }
           },
           {
-            "name": "LONGITUDE",
             "type": "number",
+            "name": "LONGITUDE",
             "constraints": {
-              "minimum": -180.0,
-              "maximum": 180.0
+              "minimum": 80.0,
+              "maximum": 170.0,
+              "required": true
             }
           },
           {
+            "type": "number",
             "name": "ZONE",
-            "type": "string"
+            "constraints": {
+              "required": true,
+              "enum": [
+                49,
+                50,
+                51,
+                52
+              ]
+            }
           },
           {
+            "type": "number",
             "name": "EASTING",
-            "type": "number"
+            "constraints": {
+              "required": true
+            }
           },
           {
+            "type": "number",
             "name": "NORTHING",
-            "type": "number"
+            "constraints": {
+              "required": true
+            }
           },
           {
+            "type": "number",
             "name": "ACCURACY",
-            "type": "string",
             "constraints": {
               "required": true
             }
           },
           {
+            "type": "date",
             "name": "DATE",
-            "type": "string",
+            "format": "fmt:%d/%m/%Y",
             "constraints": {
               "required": true
             }
           },
           {
+            "type": "number",
             "name": "NAME_ID",
-            "type": "string",
             "constraints": {
-              "required": true
+              "required": false
             }
           },
           {
-            "name": "SPECIES_NAME",
             "type": "string",
+            "name": "SPECIES_NAME",
             "constraints": {
               "required": true
+            },
+            "wl": {
+              "type": "species",
+              "speciesType": "fauna"
             }
           },
           {
-            "name": "COMMON_NAME",
-            "type": "string"
+            "type": "string",
+            "name": "COMMON_NAME"
           },
           {
-            "name": "SPECIES_GROUP",
             "type": "string",
+            "name": "SPECIES_GROUP",
             "constraints": {
               "required": true
             }
           },
           {
-            "name": "COUNT",
             "type": "number",
+            "name": "COUNT",
             "constraints": {
               "required": true
             }
           },
           {
-            "name": "IDENTIFIER",
-            "type": "string"
+            "type": "string",
+            "name": "IDENTIFIER"
           },
           {
-            "name": "CERTAINTY",
-            "type": "string"
+            "type": "string",
+            "name": "CERTAINTY"
           },
           {
-            "name": "METHOD",
             "type": "string",
+            "name": "METHOD",
             "constraints": {
               "required": true
             }
           },
           {
-            "name": "FATE",
             "type": "string",
+            "name": "FATE",
             "constraints": {
               "required": true
             }
           },
           {
-            "name": "SAMPLES",
-            "type": "string"
+            "type": "string",
+            "name": "SAMPLES"
           },
           {
-            "name": "MARKING",
-            "type": "string"
+            "type": "string",
+            "name": "MARKING"
           },
           {
-            "name": "TRANSMITTER",
-            "type": "string"
+            "type": "string",
+            "name": "TRANSMITTER"
           },
           {
-            "name": "VOUCHER_REF",
-            "type": "string"
+            "type": "string",
+            "name": "VOUCHER_REF"
           }
         ]
-      }
+      },
+      "name": "regulation-17",
+      "title": "Regulation 17"
     }
-  ]
-}
+  ],
+  "title": "Returns for regulation 17"
+}