Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adds observation type input to workflow steps #1449 #1450

Merged
merged 5 commits into from
Nov 22, 2023
Merged

adds observation type input to workflow steps #1449 #1450

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1de99e8
adds observation type to workflow setps #1449
chrabyrd Nov 20, 2023
bc4043e
nit #1449
chrabyrd Nov 20, 2023
20a0443
Merge branch 'dev/1.1.x' of https://github.com/archesproject/arches-f…
chrabyrd Nov 21, 2023
f9909de
fixes duplicate observation generation #1449
chrabyrd Nov 21, 2023
0840cac
nit #1449
chrabyrd Nov 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions ...media/js/views/components/workflows/chemical-analysis-workflow/ca-instrument-info-step.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ define([
const projectInfo = params.projectInfoData;
const physThingName = projectInfo.physThingName;
const observedThingNodeId = 'cd412ac5-c457-11e9-9644-a4d18cec433a';
const observationTypeNodeId = '7b97ee23-c457-11e9-8ce3-a4d18cec433a';
const observedThingInstanceId = projectInfo.physicalThing;
const projectInstanceId = projectInfo.project;
const projectNodeId = '736f06a4-c54d-11ea-9f58-024e0d439fdb';
Expand All @@ -48,13 +49,15 @@ define([
let procedureTileId = getProp('procedure', 'tileid');
let projectTileId = getProp('project', 'tileid');
let observedThingTileid = getProp('observedThing', 'tileid');
let observationTypeTileId = getProp('type', 'tileid');
let dateTileId = getProp('date', 'tileid');
let nameTileId = getProp('name', 'tileid');

this.instrumentValue = ko.observable(getProp('instrument', 'value'));
this.procedureValue = ko.observable(getProp('procedure', 'value'));
this.parameterValue = ko.observable(getProp('parameter', 'value'));
this.observationInstanceId = ko.observable(getProp('observationInstanceId'));
this.observationType = ko.observableArray(getProp("observationType", 'value'));
this.dateValue = ko.observable(getProp('date', 'value'));
this.showName = ko.observable(false);
this.locked = params.form.locked;
Expand Down Expand Up @@ -120,6 +123,7 @@ define([
date: {value: self.dateValue(), tileid: dateTileId},
observedThing: {tileid: observedThingTileid},
project: {tileid: projectTileId},
observationType: {value: self.observationType(), tileid: observationTypeTileId},
observationInstanceId: self.observationInstanceId()
};
});
Expand Down Expand Up @@ -225,6 +229,10 @@ define([
let observedThingData = {};
observedThingData[observedThingNodeId] = self.createRelatedInstance(observedThingInstanceId);
tiles['observedThingTile'] = self.buildTile(observedThingData, observedThingNodeId, self.observationInstanceId(), observedThingTileid);

let observationTypeData = {};
observationTypeData[observationTypeNodeId] = self.observationType();
tiles['observationTypeTile'] = self.buildTile(observationTypeData, observationTypeNodeId, self.observationInstanceId(), observationTypeTileId);

let partOfProjectData = {};
partOfProjectData[projectNodeId] = self.createRelatedInstance(projectInstanceId);
Expand Down Expand Up @@ -267,6 +275,7 @@ define([
return response.json();
}).then(function(json){
observedThingTileid = json.observedThingTile.tileid;
observationTypeTileId = json.observationTypeTile.tileid;
projectTileId = json.partOfProjectTile.tileid;
nameTileId = json.nameTile.tileid;
dateTileId = json.dateTile.tileid;
Expand Down
9 changes: 9 additions & 0 deletions ...es_for_science/media/js/views/components/workflows/upload-dataset/instrument-info-step.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ define([
const projectInfo = params.projectInfoData;
const physThingName = projectInfo.physThingName;
const observedThingNodeId = 'cd412ac5-c457-11e9-9644-a4d18cec433a';
const observationTypeNodeId = '7b97ee23-c457-11e9-8ce3-a4d18cec433a';
const observedThingInstanceId = projectInfo.physicalThing;
const projectInstanceId = projectInfo.project;
const projectNodeId = '736f06a4-c54d-11ea-9f58-024e0d439fdb';
Expand Down Expand Up @@ -57,13 +58,15 @@ define([
let procedureTileId = getProp('procedure', 'tileid');
let projectTileId = getProp('project', 'tileid');
let observedThingTileid = getProp('observedThing', 'tileid');
let observationTypeTileId = getProp('type', 'tileid');
let dateTileId = getProp('date', 'tileid');
let nameTileId = getProp('name', 'tileid');

this.instrumentValue = ko.observable(getProp('instrument', 'value'));
this.procedureValue = ko.observable(getProp('procedure', 'value'));
this.parameterValue = ko.observable(getProp('parameter', 'value'));
this.observationInstanceId = ko.observable(getProp('observationInstanceId'));
this.observationType = ko.observableArray(getProp("observationType", 'value'));
this.dateValue = ko.observable(getProp('date', 'value'));
this.showName = ko.observable(false);
this.locked = params.form.locked;
Expand Down Expand Up @@ -129,6 +132,7 @@ define([
date: {value: self.dateValue(), tileid: dateTileId},
observedThing: {tileid: observedThingTileid},
project: {tileid: projectTileId},
observationType: {value: self.observationType(), tileid: observationTypeTileId},
observationInstanceId: self.observationInstanceId()
};
});
Expand Down Expand Up @@ -234,6 +238,10 @@ define([
let observedThingData = {};
observedThingData[observedThingNodeId] = self.createRelatedInstance(observedThingInstanceId, physicalObjectObserved, observedBy);
tiles['observedThingTile'] = self.buildTile(observedThingData, observedThingNodeId, self.observationInstanceId(), observedThingTileid);

let observationTypeData = {};
observationTypeData[observationTypeNodeId] = self.observationType();
tiles['observationTypeTile'] = self.buildTile(observationTypeData, observationTypeNodeId, self.observationInstanceId(), observationTypeTileId);

let partOfProjectData = {};
partOfProjectData[projectNodeId] = self.createRelatedInstance(projectInstanceId, parentProjectOfObservation, hasObservationActivity);
Expand Down Expand Up @@ -276,6 +284,7 @@ define([
return response.json();
}).then(function(json){
observedThingTileid = json.observedThingTile.tileid;
observationTypeTileId = json.observationTypeTile.tileid;
projectTileId = json.partOfProjectTile.tileid;
nameTileId = json.nameTile.tileid;
dateTileId = json.dateTile.tileid;
Expand Down
Loading