Version 2

theodi · Oct 1, 2024 · 5bee7f2 · 5bee7f2
1 parent 0615c79
commit 5bee7f2
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 34 deletions.
diff --git a/private/js/edit-project.js b/private/js/edit-project.js
@@ -333,6 +333,9 @@ function loadNavBar(data,projectId) {
         dimension.activities.forEach(activity => {
             const dimensionPrefix = dimension.name.toLowerCase().replace(/\s+/g, '-');
             const activityId = dimensionPrefix + "-" + activity.title.toLowerCase().replace(/\s+/g, '-');
+            if (defaultActivity === "") {
+                defaultActivity = activityId;
+            }
             const activityItem = document.createElement('li');
             activityItem.classList.add('nav-activity-item'); // Add class for styling
 

diff --git a/private/schemas/newProject.json b/private/schemas/newProject.json
@@ -12,7 +12,7 @@
       },
       "title": {
         "type": "string",
-        "title": "Project Title",
+        "title": "Project title",
         "minLength": 1,
         "required": true
       },
@@ -23,22 +23,23 @@
       "organisation": {
         "type": "object",
         "title": "Organisation",
+        "required": true,
         "properties": {
           "title": {
             "type": "string",
-            "title": "Organisation Title"
+            "title": "Organisation title"
           },
           "country": {
             "type": "object",
             "title": "Country",
             "properties": {
               "name": {
                 "type": "string",
-                "title": "Country Name"
+                "title": "Country name"
               },
               "code": {
                 "type": "string",
-                "title": "Country Code"
+                "title": "Country code"
               }
             }
           }
@@ -57,7 +58,7 @@
     },
     {
       "key": "title",
-      "title": "Project Title",
+      "title": "Project title",
       "validationMessage": "Please enter the project title."
     },
     {
@@ -70,7 +71,7 @@
     },
     {
       "key": "organisation.title",
-      "title": "Organisation Name"
+      "title": "Organisation name"
     },
     {
       "key": "organisation.country.name"

diff --git a/views/pages/home.ejs b/views/pages/home.ejs
@@ -5,7 +5,7 @@
         <h1>Welcome to the ODI Maturity Assessment Tool</h1>
         <p> The ODI Maturity Assessment Tool helps organisations evaluate their data maturity across key domains such as open data, data ethics, and overall data practices. Our maturity models provide a clear, structured framework for assessing your current capabilities, identifying areas for improvement.</p>
         <p>Using this tool, you can conduct an assessment based on our maturity models to evaluate how well your organisation manages and utilises data. After completing your assessment, you'll receive a detailed report containing actionable insights tailored to your organisation’s specific needs.</p>
-        <p> If you're an ODI member, the tool leverages AI to enhance your experience further. Based on your assessment responses, the AI generates human-readable summaries for each model area, along with an overall executive summary. </p>
+        <p> If you're an ODI member, the tool leverages Artificial Intelligence (AI) to enhance your experience further. Based on your assessment responses, the AI generates human-readable summaries for each model area, along with an overall executive summary. </p>
         <p>Whether you're seeking to refine your data strategy or benchmark your organisation's progress, the ODI Maturity Assessment Tool is an invaluable resource to guide your next steps.</p>
     </div>
     <img src="/images/steps.png" alt="Maturity steps" style="display: none;"/>
@@ -29,7 +29,7 @@
         </div>
         <div class="assessment-item">
             <img src="/images/data-ethics-maturity.png" alt="Data Ethics Maturity Model" class="assessment-image"/>
-            <h3>Data Ethics Maturity Model (Coming Soon)</h3>
+            <h3>Data Ethics Maturity Model</h3>
             <p>
               The Data Ethics Maturity Model is a tool for anyone who collects, uses and shares data. It helps assess and benchmark how widely embedded data ethics culture and practices are across your organisation.
             </p>

diff --git a/views/pages/projects/edit.ejs b/views/pages/projects/edit.ejs
@@ -30,19 +30,6 @@
             <form id="dataForm"></form>
         </section>
     </section>
-    <!-- Modal Structure -->
-    <div id="statement-modal" class="modal">
-        <div class="modal-content">
-            <span class="close">&times;</span>
-            <h2 id="modal-statement"></h2>
-            <p id="modal-context"></p>
-            <div class="button-group">
-                <button id="modal-true-button" class="true-button">True</button>
-                <button id="modal-false-button" class="false-button">False</button>
-            </div>
-            <textarea id="modal-notes" placeholder="Add your notes here..."></textarea>
-        </div>
-    </div>
 
 </section>
 <%- include('../../partials/footer') %>
diff --git a/views/pages/projects/new.ejs b/views/pages/projects/new.ejs
@@ -76,7 +76,7 @@
 
                     countries.sort((a, b) => a.name.common.localeCompare(b.name.common));
                     // Create the label and dropdown elements
-                    const countryLabel = $('<label for="countryDropdown" class="form-control">Organisation Location (Country)</label>');
+                    const countryLabel = $('<label for="countryDropdown" class="form-control">Organisation location (country)</label>');
                     const countryDropdown = $('<select id="countryDropdown" class="form-control"></select>');
                     countryDropdown.append('<option value="">Select a country</option>');
 

diff --git a/views/pages/projects/view.ejs b/views/pages/projects/view.ejs
@@ -89,7 +89,7 @@ function renderMyProjects() {
             },
             {
                 data: 'organisation.title',
-                title: 'Organisation Name',
+                title: 'Organisation name',
                 width: '10%',
                 defaultContent: ''
             },
@@ -101,16 +101,16 @@ function renderMyProjects() {
             },
             {
                 data: 'assessmentData.activityCompletionPercentage',
-                title: 'Activities Complete (%)',
+                title: 'Activities complete (%)',
                 width: '10%',
                 defaultContent: '0%',
                 render: function(data, type, row) {
                     return data ? data + '%' : '0%';
                 }
             },
             {
-                data: 'assessmentData.statementCompletionPercentage',
-                title: 'Statements Complete (%)',
+                data: 'assessmentData.questionCompletionPercentage',
+                title: 'Questions answered (%)',
                 width: '10%',
                 defaultContent: '0%',
                 render: function(data, type, row) {
@@ -119,7 +119,7 @@ function renderMyProjects() {
             },
             {
                 data: 'lastModified',
-                title: 'Last Modified',
+                title: 'Last modified',
                 width: '10%',
                 render: function(data, type, row) {
                     // Parse the date string into a Date object
@@ -135,7 +135,7 @@ function renderMyProjects() {
                     return '<button class="editBtn" data-id="' + row._id + '">Edit</button>' +
                            '<button class="shareBtn" data-id="' + row._id + '">Share</button>' +
                            '<button class="deleteBtn" data-id="' + row._id + '">Delete</button>' +
-                           '<button class="reportBtn" data-id="' + row._id + '">View Report</button>'
+                           '<button class="reportBtn" data-id="' + row._id + '">View report</button>'
                 }
             }
         ],
@@ -269,7 +269,7 @@ function renderSharedProjects(data) {
             },
             {
                 data: 'organisation.title',
-                title: 'Organisation Name',
+                title: 'Organisation name',
                 width: '10%',
                 defaultContent: ''
             },
@@ -281,16 +281,16 @@ function renderSharedProjects(data) {
             },
             {
                 data: 'assessmentData.activityCompletionPercentage',
-                title: 'Activities Complete (%)',
+                title: 'Activities complete (%)',
                 width: '10%',
                 defaultContent: '0%',
                 render: function(data, type, row) {
                     return data ? data + '%' : '0%';
                 }
             },
             {
-                data: 'assessmentData.statementCompletionPercentage',
-                title: 'Statements Complete (%)',
+                data: 'assessmentData.questionCompletionPercentage',
+                title: 'Questions answered (%)',
                 width: '10%',
                 defaultContent: '0%',
                 render: function(data, type, row) {
@@ -305,7 +305,7 @@ function renderSharedProjects(data) {
             },
             {
                 data: 'lastModified',
-                title: 'Last Modified',
+                title: 'Last modified',
                 width: '10%',
                 render: function(data, type, row) {
                     // Parse the date string into a Date object
@@ -319,7 +319,7 @@ function renderSharedProjects(data) {
                 width: '20%',
                 render: function (data, type, row) {
                     return '<button class="editBtn" data-id="' + row._id + '">Edit</button>' +
-                           '<button class="reportBtn" data-id="' + row._id + '">View Report</button>'
+                           '<button class="reportBtn" data-id="' + row._id + '">View report</button>'
                 }
             }
         ],