Merge pull request #633 from nearbeach/develop

Develop

NearBeach/templates/NearBeach/sprints/sprint_information.html

@@ -14,6 +14,7 @@
             v-bind:gantt-start-date="`{{ gantt_start_date }}`"
             v-bind:location-id="{{ sprint_id }}"
             v-bind:root-url="`{% url 'dashboard' %}`"
+            v-bind:parent-status="`{{ sprint_status }}`"
             v-bind:theme="`{{ theme }}`"
             v-bind:user-level="{{ user_level }}"
     ></gantt-information>

NearBeach/views/sprint_views.py

@@ -254,6 +254,7 @@ def sprint_information(request, sprint_id, *args, **kwargs):
     c = {
         "gantt_end_date": gantt_end_date,
         "gantt_start_date": gantt_start_date,
+        "sprint_status": sprint_results[0]['sprint_status'],
         "nearbeach_title": f"Sprint Information {sprint_id}",
         "need_tinymce": False,
         "sprint_id": sprint_id,

src/js/components/customers/CustomerInformation.vue

@@ -3,9 +3,8 @@
 		<div class="card">
 			<div class="card-body">
 				<!-- TITLE -->
-				<h1>Customer Information</h1>
+				<h1 class="mb-4">Customer Information</h1>
 				<a v-bind:href="`${rootUrl}search/customer/`"
-				   class="mt-4"
 				>Go back to customer search</a
 				>
 				<hr/>

src/js/components/gantt_chart/GanttInformation.vue

@@ -14,6 +14,7 @@
 				:key="index"
 				v-bind:end-date="row.end_date"
 				v-bind:index="index"
+				v-bind:is-closed="isParentClosed()"
 				v-bind:object-id="row.object_id"
 				v-bind:object-type="row.object_type"
 				v-bind:higher-order-status="row.higher_order_status"
@@ -89,6 +90,10 @@ export default {
 			type: Number,
 			default: 0,
 		},
+		parentStatus: {
+			type: String,
+			default: "",
+		},
 		rootUrl: {
 			type: String,
 			default: "/",
@@ -192,6 +197,14 @@ export default {
 				});
 			})
 		},
+		isParentClosed() {
+			const closed_status = [
+				'finished',
+				'closed',
+			];
+
+			return closed_status.includes(this.parentStatus.toLowerCase());
+		},
 		mouseDown(data) {
 			//Update the mouse down variables
 			this.mdClientXInitial = data.mdClientXInitial;
@@ -227,6 +240,9 @@ export default {
 			//Prevents default
 			event.preventDefault();
 
+			//If closed do nothing
+			if (this.isParentClosed()) return;
+
 			//Make sure not on a touch device
 			const touch = matchMedia('(hover: none)').matches;
 			if (touch) return;

src/js/components/gantt_chart/RenderGanttRow.vue

@@ -9,7 +9,7 @@
 					v-model:value="localStartDate"
 					type="datetime"
 					@update:value="modifiedStartDate"
-                    :disabled="userLevel <= 1"
+                    :disabled="userLevel <= 1 || isClosed"
 					:format="datePickerFormat"
 				/>
 			</div>
@@ -18,7 +18,7 @@
 					v-model:value="localEndDate"
 					type="datetime"
 					@update:value="modifiedEndDate"
-                    :disabled="userLevel <= 1"
+                    :disabled="userLevel <= 1 || isClosed"
 					:format="datePickerFormat"
 				></n-date-picker>
 			</div>
@@ -27,7 +27,7 @@
 					v-model:value="localStatusId"
 					:options="statusList"
 					:on-update-value="updateStatus"
-                    :disabled="userLevel <= 1"
+                    :disabled="userLevel <= 1 || isClosed"
 				></n-select>
 			</div>
 		</div>
@@ -90,6 +90,10 @@ export default {
 			type: Number,
 			default: 0,
 		},
+		isClosed: {
+			type: Boolean,
+			default: false,
+		},
 		objectId: {
 			type: Number,
 			default: 0,

src/js/components/groups/GroupInformation.vue

@@ -2,9 +2,8 @@
 	<n-config-provider :theme="getTheme(theme)">
 		<div class="card">
 			<div class="card-body">
-				<h1>Group Information</h1>
+				<h1 class="mb-4">Group Information</h1>
 				<a v-bind:href="`${this.rootUrl}search/group/`"
-				   class="mt-4"
 				>Back to group list</a
 				>
 				<hr/>

src/js/components/organisations/NewOrganisation.vue

@@ -130,6 +130,7 @@
 					<button
 						class="btn btn-primary save-changes"
 						v-on:click="uploadOrganisationData"
+						v-bind:disabled="disableSubmitButton"
 					>
 						Submit Organisation
 					</button>
@@ -165,6 +166,7 @@ export default {
 	},
 	data() {
 		return {
+			disableSubmitButton: false,
 			duplicateOrganisations: [],
 			organisationNameModel: "",
 			organisationWebsiteModel: "",
@@ -244,6 +246,9 @@ export default {
 			return data_to_send;
 		},
 		uploadOrganisationData() {
+			//Disable the upload button
+			this.disableSubmitButton = true;
+
 			//Use Axios to send the data
 			//Get the data to send
 			this.axios.post(
@@ -259,6 +264,9 @@ export default {
 					extra_classes: "bg-danger",
 					delay: 0,
 				});
+
+				//Enable the submit button
+				this.disableSubmitButton = false;
 			});
 		},
 	},