@@ -233,7 +242,11 @@ export default {
assignedModules: null,
isShowing: false,
barCodeSrc: null,
- permissions: null
+ permissions: null,
+ repositoryRowUrl: null,
+ actions: null,
+ myModuleId: null,
+ inRepository: false
}
},
created() {
@@ -242,6 +255,7 @@ export default {
mounted() {
// Add a click event listener to the document
document.addEventListener('click', this.handleOutsideClick);
+ this.inRepository = $('.assign-items-to-task-modal-container').length > 0;
},
beforeDestroy() {
delete window.repositoryItemSidebarComponent;
@@ -257,30 +271,34 @@ export default {
this.toggleShowHideSidebar(null)
}
},
- toggleShowHideSidebar(repositoryRowUrl) {
+ toggleShowHideSidebar(repositoryRowUrl, myModuleId = null) {
// initial click
if (this.currentItemUrl === null) {
- this.isShowing = true
- this.loadRepositoryRow(repositoryRowUrl)
- this.currentItemUrl = repositoryRowUrl
+ this.myModuleId = myModuleId;
+ this.isShowing = true;
+ this.loadRepositoryRow(repositoryRowUrl);
+ this.currentItemUrl = repositoryRowUrl;
return
}
// click on the same item - should just open/close it
else if (this.currentItemUrl === repositoryRowUrl) {
- this.isShowing = false
- this.currentItemUrl = null
+ this.isShowing = false;
+ this.currentItemUrl = null;
+ this.myModuleId = null;
return
}
// explicit close (from emit)
else if (repositoryRowUrl === null) {
- this.isShowing = false
- this.currentItemUrl = null
+ this.isShowing = false;
+ this.currentItemUrl = null;
+ this.myModuleId = null;
return
}
// click on a different item - should just fetch new data
else {
- this.loadRepositoryRow(repositoryRowUrl)
- this.currentItemUrl = repositoryRowUrl
+ this.myModuleId = myModuleId;
+ this.loadRepositoryRow(repositoryRowUrl);
+ this.currentItemUrl = repositoryRowUrl;
return
}
},
@@ -289,14 +307,16 @@ export default {
$.ajax({
method: 'GET',
url: repositoryRowUrl,
+ data: { my_module_id: this.myModuleId },
dataType: 'json',
success: (result) => {
this.repositoryRowId = result.id;
this.repository = result.repository;
this.defaultColumns = result.default_columns;
this.customColumns = result.custom_columns;
- this.dataLoading = false
+ this.dataLoading = false;
this.assignedModules = result.assigned_modules;
+ this.actions = result.actions;
this.permissions = result.permissions
this.$nextTick(() => {
this.generateBarCode(this.defaultColumns.code);
@@ -304,6 +324,16 @@ export default {
}
});
},
+ reload() {
+ if(this.isShowing) {
+ this.loadRepositoryRow(this.currentItemUrl);
+ }
+ },
+ showRepositoryAssignModal() {
+ if (this.inRepository) {
+ window.AssignItemsToTaskModalComponentContainer.showModal([this.repositoryRowId]);
+ }
+ },
generateBarCode(text) {
if(!text) return;
const barCodeCanvas = bwipjs.toCanvas('bar-code-canvas', {
diff --git a/app/views/repositories/_assign_items_to_task_modal.html.erb b/app/views/repositories/_assign_items_to_task_modal.html.erb
index 09795c66a..2f283c533 100644
--- a/app/views/repositories/_assign_items_to_task_modal.html.erb
+++ b/app/views/repositories/_assign_items_to_task_modal.html.erb
@@ -7,6 +7,7 @@
>
diff --git a/app/views/repository_rows/show.json.jbuilder b/app/views/repository_rows/show.json.jbuilder
index 3f3230a2e..341128609 100644
--- a/app/views/repository_rows/show.json.jbuilder
+++ b/app/views/repository_rows/show.json.jbuilder
@@ -10,6 +10,16 @@ end
json.permissions do
json.can_export_repository_stock can_export_repository_stock?(@repository_row.repository)
end
+
+json.actions do
+ if @my_module.present?
+ json.assign_repository_row do
+ json.assign_url my_module_repositories_path(@my_module.id)
+ json.disabled @my_module_assign_error.present?
+ end
+ end
+end
+
json.default_columns do
json.name @repository_row.name
json.code @repository_row.code
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 822410886..865c65f7d 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2152,7 +2152,7 @@ en:
disabled_placeholder: "Select Experiment to enable Task"
no_options_placeholder: "No tasks available to assign items"
assign:
- text: "Assign to this task"
+ text: "Assign to task"
flash_all_assignments_success: "Successfully assigned %{count} item(s) to the task."
flash_some_assignments_success: "Successfully assigned %{assigned_count} item(s) to the task. %{skipped_count} item(s) were already assigned to the task."
flash_assignments_failure: "Failed to assign item(s) to task."
@@ -2227,6 +2227,7 @@ en:
print_label: "Print label"
assigned:
empty: "This item is not assigned to any task."
+ assign: "Assign to task"
private:
one: "Assigned to %{count} private task"
other: "Assigned to %{count} private tasks"
@@ -2476,7 +2477,7 @@ en:
no_tasks: "This item in not assigned to any task."
amount: "Amount: %{value}"
unit: "Unit: %{unit}"
- assign_to_task: "Assign to this task"
+ assign_to_task: "Assign to task"
assign_to_task_error:
no_access: "You can only view this task"
already_assigned: "This item is already assigned to this task"
@@ -3500,7 +3501,7 @@ en:
description: "Once you create items in the inventory, they will appear here."
buttons:
insert: "Insert"
- assign: "Assign to this task"
+ assign: "Assign to task"
projects: PROJECTS
experiments: EXPERIMENTS
tasks: TASKS