Skip to content

Commit

Permalink
Merge pull request #563 from nearbeach/development-0.30.35
Browse files Browse the repository at this point in the history
Development 0.30.35
  • Loading branch information
robotichead committed Jan 14, 2024
2 parents 02c40c9 + c38b11d commit b01cd9c
Show file tree
Hide file tree
Showing 141 changed files with 191 additions and 81 deletions.
2 changes: 1 addition & 1 deletion NearBeach/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
name = "NearBeach"
__version__ = "0.30.33"
__version__ = "0.30.34"
Binary file modified NearBeach/static/NearBeach/1677.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/2001.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/3178.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/4344.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/4527.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/5065.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/5594.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/6115.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/7126.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/7449.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/764.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/7787.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/8362.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/8391.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/9118.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/9183.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/9686.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/9803.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/9980.min.js.gz
Binary file not shown.
2 changes: 1 addition & 1 deletion NearBeach/static/NearBeach/NearBeach.min.js

Large diffs are not rendered by default.

Binary file modified NearBeach/static/NearBeach/NearBeach.min.js.LICENSE.txt.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/NearBeach.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/NearBeach.png.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/NearBeach_Small.png.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/change-task-information.min.js.gz
Binary file not shown.
2 changes: 1 addition & 1 deletion NearBeach/static/NearBeach/change-task-modules.min.js

Large diffs are not rendered by default.

Binary file modified NearBeach/static/NearBeach/change-task-modules.min.js.gz
Binary file not shown.
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/confirm-kanban-board-reopen.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/customer-information.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/dashboard-kanban-list.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/dashboard-my-objects.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/dashboard-rfc-approvals.min.js.gz
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/group-information.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/images/NearBeach_logo.svg.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/images/placeholder/body_text.svg.gz
Binary file not shown.
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/images/placeholder/people_tax.svg.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/images/placeholder/product_tour.svg.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/images/placeholder/profile_pic.svg.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/images/placeholder/questions.svg.gz
Binary file not shown.
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/images/placeholder/search.svg.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/images/placeholder/setup.svg.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/kanban-danger-zone.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/kanban-edit-board.min.js.gz
Binary file not shown.
2 changes: 1 addition & 1 deletion NearBeach/static/NearBeach/kanban-group-permissions.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified NearBeach/static/NearBeach/kanban-group-permissions.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/kanban-information.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/kanban-public-links.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/list-search-results.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/loader.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/login.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/new-customer.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/new-group.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/new-kanban.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/new-notification.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/new-permission-set.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/new-project.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/new-request-for-change.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/new-requirement.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/new-task.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/new-user.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/notification-information.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/organisation-information.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/organisation-modules.min.js.gz
Binary file not shown.
2 changes: 1 addition & 1 deletion NearBeach/static/NearBeach/parent-modules.min.js

Large diffs are not rendered by default.

Binary file modified NearBeach/static/NearBeach/parent-modules.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/permission-information.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/profile-information.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/project-information.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/public-card-information.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/public-kanban-board.min.js.gz
Binary file not shown.
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/render-toasts.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/requirement-information.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/requirement-item-information.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/reset-user-password.min.js.gz
Binary file not shown.
2 changes: 1 addition & 1 deletion NearBeach/static/NearBeach/rfc-Information.min.js

Large diffs are not rendered by default.

Binary file modified NearBeach/static/NearBeach/rfc-Information.min.js.gz
Binary file not shown.
2 changes: 1 addition & 1 deletion NearBeach/static/NearBeach/rfc-modules.min.js

Large diffs are not rendered by default.

Binary file modified NearBeach/static/NearBeach/rfc-modules.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/search-customers.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/search-groups.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/search-notifications.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/search-objects.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/search-organisations.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/search-permission-sets.min.js.gz
Binary file not shown.
2 changes: 1 addition & 1 deletion NearBeach/static/NearBeach/search-tags.min.js

Large diffs are not rendered by default.

Binary file modified NearBeach/static/NearBeach/search-tags.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/search-users.min.js.gz
Binary file not shown.
Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.
2 changes: 1 addition & 1 deletion NearBeach/static/NearBeach/task-information.min.js

Large diffs are not rendered by default.

Binary file modified NearBeach/static/NearBeach/task-information.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/update-profile-picture.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/user-information.min.js.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/user-list.min.js.gz
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nearbeach",
"version": "0.30.33",
"version": "0.30.34",
"description": "NearBeach - an Open Source project management system built with Django web framework",
"main": "/src/js/app.js",
"directories": {
Expand Down
45 changes: 32 additions & 13 deletions src/js/components/change_task/modules/ChangeTaskDescription.vue
Original file line number Diff line number Diff line change
Expand Up @@ -86,27 +86,46 @@ export default {
const url = `${this.rootUrl}documentation/request_for_change/${this.changeTaskResults[0].fields.request_for_change}/upload/`;
//Use axios to send the data
this.axios
.post(url, data_to_send, config)
.then((response) => {
//Just send the location to the success
success(`/private/${response.data[0].document_key_id}`);
})
.catch((error) => {
});
this.axios.post(
url,
data_to_send, config
).then((response) => {
//Just send the location to the success
success(`/private/${response.data[0].document_key_id}`);
}).catch((error) => {
});
},
updateDescription() {
this.$store.dispatch("newToast", {
header: "Updating Description",
message: "Updating Description, please wait",
extra_classes: "bg-warning",
delay: 0,
unique_type: "save_description",
});
const data_to_send = new FormData();
data_to_send.set('change_task_description', this.changeDescriptionModel);
this.axios.post(
"update/description/",
data_to_send,
).then((response) => {
})
.catch((error) => {
})
).then(() => {
this.$store.dispatch("newToast", {
header: "Updated Description",
message: "Description Updated",
extra_classes: "bg-success",
unique_type: "save_description",
});
}).catch((error) => {
this.$store.dispatch("newToast", {
header: "Failed Updating Description",
message: `Sorry - description failed to update. Error -> ${error}`,
extra_classes: "bg-warning",
delay: 0,
unique_type: "save_description",
});
});
},
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ export default {
if (this.locationId === 0) {
setTimeout(() => {
this.getGroupAndUserData();
}, 100);
}, 500);
return;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ export default {
//Have to wait a little extra - tick does not work :'(
setTimeout(() => {
this.getAllChangeTasks();
}, 200);
}, 500);
}
}
</script>
2 changes: 1 addition & 1 deletion src/js/components/request_for_change/RfcInformation.vue
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,7 @@ export default {
this.$store.dispatch("newToast", {
header: "Save Successfully",
message: "RFC Has saved",
delay: 3000,
delay: 10000,
extra_classes: "bg-success",
});
})
Expand Down
27 changes: 22 additions & 5 deletions src/js/components/request_for_change/RfcModules.vue
Original file line number Diff line number Diff line change
Expand Up @@ -366,18 +366,35 @@ export default {
},
methods: {
sendData(data_to_send, url) {
//Open up the loading modal
this.showLoadingModal("Project");
//Notify user of updating
this.$store.dispatch("newToast", {
header: "Updating Risk",
message: "Currently updating risk - please wait",
extra_classes: "bg-warning",
delay: 0,
unique_type: "save_risk",
})
//Use axios to send the data
this.axios
.post(url, data_to_send)
.then((response) => {
.then(() => {
//Notify user of success update
this.closeLoadingModal();
this.$store.dispatch("newToast", {
header: "Successfully Updated Risk",
message: "Risk is now updated",
extra_classes: "bg-success",
unique_type: "save_risk",
});
})
.catch((error) => {
this.showErrorModal(error, this.destination);
this.$store.dispatch("newToast", {
header: "Updating Risk Failed",
message: `Sorry, but risk has failed to update. Error -> ${error}`,
extra_classes: "bg-danger",
delay: 0,
unique_type: "save_risk",
});
});
},
updateBackoutPlan() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@
</span>
</div>

<div v-if="changeTask.is_downtime">Downtime Scheduled</div>

<div v-if="blockedBy(changeTask.change_task_id).length > 0">
<div class="change-task--blocked-by">
Change task currently blocked by;
Expand Down
72 changes: 52 additions & 20 deletions src/js/components/tags/EditTagModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -216,11 +216,27 @@ export default {
return return_class;
},
newTag(data_to_send) {
//Tell user of saving tag
this.$store.dispatch("newToast", {
header: "New Tag",
message: "Creating new Tag - please wait",
extra_classes: "bg-warning",
delay: 0,
unique_type: "save_tag",
});
//Use axios to send data
this.axios.post(
`${this.rootUrl}tag/new/`,
data_to_send
).then((response) => {
this.$store.dispatch("newToast", {
header: "Tag Saved",
message: "Tag has been successfully saved",
extra_classes: "bg-success",
unique_type: "save_tag",
});
// Send data upstream
this.$emit("new_tag", response.data);
Expand Down Expand Up @@ -255,29 +271,45 @@ export default {
this.tagColourModel = selected_colour;
},
updateTag(data_to_send) {
//Tell user of saving tag
this.$store.dispatch("newToast", {
header: "Updating Tag",
message: "Updating Tag - please wait",
extra_classes: "bg-warning",
delay: 0,
unique_type: "save_tag",
});
//Use axios to send data
this.axios
.post(`${this.rootUrl}tag/save/`, data_to_send)
.then(() => {
// Send data upstream
this.$emit("update_tags", {
tag_id: this.tagId,
tag_name: this.tagNameModel,
tag_colour: this.tagColourModel,
tag_text_colour: this.tagTextColourModel,
});
this.axios.post(
`${this.rootUrl}tag/save/`,
data_to_send
).then(() => {
this.$store.dispatch("newToast", {
header: "Tag Updated",
message: "Tag has been updated successfully",
extra_classes: "bg-success",
unique_type: "save_tag",
});
//Close the modal
document.getElementById("editTagCloseModal").click();
})
.catch((error) => {
this.$store.dispatch("newToast", {
header: "Can not update tag",
message: `Sorry, we could not update your tag. Error -> ${error}`,
extra_classes: "bg-danger",
delay: 0,
});
// Send data upstream
this.$emit("update_tags", {
tag_id: this.tagId,
tag_name: this.tagNameModel,
tag_colour: this.tagColourModel,
tag_text_colour: this.tagTextColourModel,
});
//Close the modal
document.getElementById("editTagCloseModal").click();
}).catch((error) => {
this.$store.dispatch("newToast", {
header: "Can not update tag",
message: `Sorry, we could not update your tag. Error -> ${error}`,
extra_classes: "bg-danger",
delay: 0,
});
});
},
},
};
Expand Down
22 changes: 20 additions & 2 deletions src/js/components/tasks/TaskInformation.vue
Original file line number Diff line number Diff line change
Expand Up @@ -291,12 +291,25 @@ export default {
//If the form is not validated
if (this.v$.$invalid) {
this.showValidationErrorModal();
this.$store.dispatch("newToast", {
header: "Validation issues",
message: "Please correct the validation issues before submitting",
extra_classes: "bg-warning",
unique_type: "save_task",
});
//User does not need to do anything else
return;
}
this.$store.dispatch("newToast", {
header: "Saving Task",
message: "Please wait whilst saving task",
extra_classes: "bg-warning",
delay: 0,
unique_type: "save_task",
})
//Create the data_to_send array
const data_to_send = new FormData();
data_to_send.set(
Expand All @@ -323,7 +336,12 @@ export default {
data_to_send
).then(() => {
//Hide the loading modal
this.closeLoadingModal();
this.$store.dispatch("newToast", {
header: "Task Saved",
message: "Task has successfully been saved",
extra_classes: "bg-success",
unique_type: "save_task",
});
if (this.checkStatusIsClosed()) {
window.location.reload();
Expand Down

0 comments on commit b01cd9c

Please sign in to comment.