Merge pull request #103 from defencedigital/postgres-migration

Postgres migration

3 files changed, 55 insertions, 5 deletions

diff --git a/core/static/css/output.css b/core/static/css/output.css
index 0a5c4ee..7850c75 100644
--- a/core/static/css/output.css
+++ b/core/static/css/output.css
@@ -1428,6 +1428,10 @@ html {
   align-items: center;
 }
 
+.justify-end {
+  justify-content: flex-end;
+}
+
 .justify-center {
   justify-content: center;
 }
diff --git a/engagements/templates/engagements/engagement_effort_create.html b/engagements/templates/engagements/engagement_effort_create.html
index 09a357a..f4edc8d 100644
--- a/engagements/templates/engagements/engagement_effort_create.html
+++ b/engagements/templates/engagements/engagement_effort_create.html
@@ -8,11 +8,13 @@
     <div class="container mx-auto max-w-2xl mt-8">
         <div class="bg-white shadow-md rounded px-8 pt-6 pb-8 mb-4 relative">
             <a href="{{ request.META.HTTP_REFERER }}" class="absolute top-2 right-2">
-                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
-                    <path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />
+                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+                     stroke="currentColor" class="w-6 h-6">
+                    <path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12"/>
                 </svg>
             </a>
-            <h2 class="text-2xl font-bold mb-6">Register <span class="underline decoration-blue-500 decoration-2">{{ etype|lower }}</span> time</h2>
+            <h2 class="text-2xl font-bold mb-6">Register <span
+                    class="underline decoration-blue-500 decoration-2">{{ etype|lower }}</span> time</h2>
             <div class="flex items-end mb-6">
                 <svg id="map-pin" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
                      stroke="currentColor"
@@ -47,11 +49,54 @@
 
             <div class="bg-blue-50 border border-blue-200 rounded-md p-4 mb-6">
                 <p class="text-sm text-blue-800">
-                    Please fill out the form below to log your <strong>{{ etype|lower }}</strong> effort for this engagement. 
+                    Please fill out the form below to log your <strong>{{ etype|lower }}</strong> effort for this
+                    engagement.
                     Make sure to provide accurate information for proper tracking and reporting.
                 </p>
+
+                <hr class="my-2">
+
+                {% if etype == "REGULATION" %}
+                    <div class="text-sm text-blue-800 mt-2">
+                        <p class="mb-2">This is time on-site. Actual {{ etype|lower }}!</p>
+                        <ul class="list-disc list-inside">
+                            <li>Carrying out the work</li>
+                            <li>Follow up meetings, etc</li>
+                        </ul>
+                    </div>
+                {% elif etype == "TRAVEL" %}
+                    <div class="text-sm text-blue-800 mt-2">
+                        <p class="mb-2">Time spent travelling to and from the engagement.</p>
+                        <ul class="list-disc list-inside">
+                            <li>Travelling to</li>
+                            <li>Travelling from</li>
+                        </ul>
+                    </div>
+                {% elif etype == "PLANNING" %}
+                    <div class="text-sm text-blue-800 mt-2">
+                        <p>Loads of stuff about Planning.</p>
+                        <p class="mb-2">Anyting related to planning for the engagement.</p>
+                        <ul class="list-disc list-inside">
+                            <li>Initial planning</li>
+                            <li>Planning meetings</li>
+                            <li>Reviewing past data</li>
+                        </ul>
+                    </div>
+                {% elif etype == "REPORTING" %}
+                    <div class="text-sm text-blue-800 mt-2">
+                        <p class="mb-2">Anyting related to reporting for the engagement.</p>
+                        <ul class="list-disc list-inside">
+                            <li>Writing up notes</li>
+                            <li>Writing draft and final report</li>
+                            <li>Reviewing colleagues' report drafts</li>
+                        </ul>
+                    </div>
+                {% endif %}
+
                 <hr class="my-2">
-                <p><a class="text-sm font-bold underline text-blue-800" href="#">Help</a></p>
+                <div class="flex items-end justify-end">
+                    <p><a class="text-sm font-semibold underline text-blue-800" href="#">Help</a></p>
+                </div>
             </div>
 
             <form method="post" class="space-y-6">
diff --git a/requirements.txt b/requirements.txt
index 468d422..ff555a3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,3 +6,4 @@ gunicorn==22.0.0
 psycopg2==2.9.9
 tzdata==2024.1
 whitenoise==6.6.0
+django-widget-tweaks==1.5.0
\ No newline at end of file