Skip to content

Continuing LIMS and queue integration

Marcus Oskarsson requested to merge gh-f68856cf/348/marcus-oscarsson/master into master

Created by: marcus-oscarsson

Dear all,

I wanted to divide this PR into two PRs, one for queue integration and one for LIMS but I finally decided that it was easier to just have one. In anyways, that's why there are both LIMS and queue related features in the same PR :). Ill try to avoid this in the future ...

I started to take care of the sample order, since the JS object is non ordered. Ive created a structure called sampleOrder and refactored the grid-ordering slightly for that purpose. The next thing to do is to use this in the queue and finally of course on the back end so that the samples are executed in order :). Exactly how to use this have to be determined it could perhaps be replaced by or replace the existing todo structure.

The "execution state" of a task was moved from dislpayData to queue. There are also some smaller improvements to the grid, like disabling certain controls while executing.

For the lims part, Ive started to prepare for having the data collection results being shown (LIMS collection ID being sent as part of the result) . The prefix is now taken from the Session object. There is also a new UI for filtering (although not completely done yet).

The mockup objects for lims are also used by default :)

Ive not yet had the time to take care of the proposal list for the "one login" to "many proposal" mapping. Ill try to do it next week (when our shutdown is over).

Cheers, Marcus

Merge request reports