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.

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

It fixes issue #489 #490

Merged
merged 1 commit into from
Feb 22, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
27 changes: 14 additions & 13 deletions csv/example3.csv
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
# For more information go to https://github.com/ispyb/EXI/wiki/Fill-shipment-from-CSV
pacelA3,containerA3,SPINEpuck,1,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,30,0,1.6,comments
pacelA3,containerA3,SPINEpuck,2,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,31,0,1.6,comments
pacelA3,containerA3,SPINEpuck,3,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,32,0,1.6,comments
pacelA3,containerA3,SPINEpuck,4,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,33,0,1.6,comments
pacelA3,containerA3,SPINEpuck,5,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,34,0,1.6,comments
pacelA3,containerA3,SPINEpuck,6,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,35,0,1.6,comments
pacelA3,containerA3,SPINEpuck,7,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,36,0,1.6,comments
pacelA3,containerA3,SPINEpuck,8,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,37,0,1.6,comments
pacelA3,containerA3,SPINEpuck,9,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,38,0,1.6,comments
pacelA3,containerA3,SPINEpuck,10,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,39,0,1.6,comments
pacelA3,containerA4,Unipuck,1,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,40,0,1.6,comments
pacelA3,containerA4,Unipuck,2,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,41,0,1.6,comments
# For more information go to https://github.com/ispyb/EXI/wiki/Fill-shipment-from-CSV,,,,,,,,,,,,,,,,,,,,,,,,,,,
#parcel name, container name, container type, container position, protein acronym, sample acronym, pin barcode, SPG, cellA, cellB, cellC, cellAlpha, cellBeta, cellGamma, experimentType, aimed Resolution, required Resolution, beam diameter, number of positions, aimed multiplicity, aimed completeness, forced SPG, radiation sensitivity, smiles, total rot. angle, min osc. angle, observed resolution, comments
parcelA3,containerA3,SPINEpuck,1,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,30,0.2,1.6,comments
parcelA3,containerA3,SPINEpuck,2,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,31,0.2,1.6,comments
parcelA3,containerA3,SPINEpuck,3,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,32,0.2,1.6,comments
parcelA3,containerA3,SPINEpuck,4,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,33,0.2,1.6,comments
parcelA3,containerA3,SPINEpuck,5,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,34,0.2,1.6,comments
parcelA3,containerA3,SPINEpuck,6,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,35,0.2,1.6,comments
parcelA3,containerA3,SPINEpuck,7,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,36,0.2,1.6,comments
parcelA3,containerA3,SPINEpuck,8,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,37,0.2,1.6,comments
parcelA3,containerA3,SPINEpuck,9,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,38,0.2,1.6,comments
parcelA3,containerA3,SPINEpuck,10,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,39,0.2,1.6,comments
parcelA3,containerA4,Unipuck,1,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,40,0.2,1.6,comments
parcelA3,containerA4,Unipuck,2,5HT3,testtes2t1,,,,,,,,,Default,1,2,3,4,5,6,P1,100,,41,0.2,1.6,comments
6 changes: 2 additions & 4 deletions js/core/controller/sessioncontroller.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,8 @@ SessionController.prototype.init = function() {

EXI.addMainPanel(mainView);

var onSuccess = function(sender, data){

mainView.load(EXI.proposalManager.getSessions());

var onSuccess = function(sender, data){
mainView.load(EXI.proposalManager.getSessions());
EXI.setLoadingMainPanel(false);
};
EXI.setLoadingMainPanel();
Expand Down
9 changes: 5 additions & 4 deletions js/core/view/managerwelcomemainview.js
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ ManagerWelcomeMainView.prototype.load = function(username) {
this.username = username;
/** By default for users we load all the sessions and managers only sessions that occurs today */
if (this.isUser(username)){
this.loadSessionsByProposal(username);
this.loadSessionsByUsername(username);
/** set active proposal */
this.activeProposal(username);
}
Expand All @@ -307,15 +307,16 @@ ManagerWelcomeMainView.prototype.load = function(username) {
*
* @method loadSessions
*/
ManagerWelcomeMainView.prototype.loadSessionsByProposal = function(username) {
ManagerWelcomeMainView.prototype.loadSessionsByUsername = function(username) {
this.username = username;
var _this = this;
this.panel.setLoading(true);
function onSuccess(sender, data){
_this.displaySessions(data, " sessions for proposal " + username);
_this.displaySessions(data, " sessions for user " + username);
_this.panel.setLoading(false);
}
EXI.getDataAdapter({onSuccess:onSuccess}).proposal.session.getSessionsByProposal(username);
//EXI.getDataAdapter({onSuccess:onSuccess}).proposal.session.getSessionsByProposal(username);
EXI.getDataAdapter({onSuccess:onSuccess}).proposal.session.getSessionsByToken();
};


Expand Down
5 changes: 5 additions & 0 deletions js/ispyb-client/proposal/sessiondataadapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ SessionDataAdapter.prototype.getSessions = function(){
this.get('/{token}/proposal/{proposal}/session/list');
};

SessionDataAdapter.prototype.getSessionsByToken = function(){
this.get('/{token}/session/list');
};


SessionDataAdapter.prototype.getSessionsByProposal = function(proposal){
this.get('/{token}/proposal/{0}/session/list'.format([proposal]));
};
Expand Down
2 changes: 0 additions & 2 deletions mx/dev.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@

<!-- bower:js -->
<script src="../bower_components/jquery/dist/jquery.js"></script>
<script src="../bower_components/zeroclipboard/dist/ZeroClipboard.js"></script>
<script src="../bower_components/moment/moment.js"></script>
<script src="../bower_components/pikaday/pikaday.js"></script>
<script src="../bower_components/handsontable/dist/handsontable.js"></script>
Expand All @@ -50,7 +49,6 @@
<script src="../bower_components/notifyjs/dist/notify.js"></script>
<script src="../bower_components/bootstrap-multiselect/dist/js/bootstrap-multiselect.js"></script>
<script src="../bower_components/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js"></script>
<script src="../bower_components/file-saver/FileSaver.js"></script>
<script src="../bower_components/html-docx-js/dist/html-docx.js"></script>
<!-- endbower -->

Expand Down
2 changes: 0 additions & 2 deletions saxs/dev.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@

<!-- bower:js -->
<script src="../bower_components/jquery/dist/jquery.js"></script>
<script src="../bower_components/zeroclipboard/dist/ZeroClipboard.js"></script>
<script src="../bower_components/moment/moment.js"></script>
<script src="../bower_components/pikaday/pikaday.js"></script>
<script src="../bower_components/handsontable/dist/handsontable.js"></script>
Expand All @@ -52,7 +51,6 @@
<script src="../bower_components/notifyjs/dist/notify.js"></script>
<script src="../bower_components/bootstrap-multiselect/dist/js/bootstrap-multiselect.js"></script>
<script src="../bower_components/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js"></script>
<script src="../bower_components/file-saver/FileSaver.js"></script>
<script src="../bower_components/html-docx-js/dist/html-docx.js"></script>
<!-- endbower -->

Expand Down
57 changes: 7 additions & 50 deletions test/dev.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@

<!-- bower:js -->
<script src="../bower_components/jquery/dist/jquery.js"></script>
<script src="../bower_components/zeroclipboard/dist/ZeroClipboard.js"></script>
<script src="../bower_components/moment/moment.js"></script>
<script src="../bower_components/pikaday/pikaday.js"></script>
<script src="../bower_components/handsontable/dist/handsontable.js"></script>
Expand All @@ -52,7 +51,6 @@
<script src="../bower_components/notifyjs/dist/notify.js"></script>
<script src="../bower_components/bootstrap-multiselect/dist/js/bootstrap-multiselect.js"></script>
<script src="../bower_components/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js"></script>
<script src="../bower_components/file-saver/FileSaver.js"></script>
<script src="../bower_components/html-docx-js/dist/html-docx.js"></script>
<!-- endbower -->

Expand All @@ -62,57 +60,16 @@


<!-- EXI-UI-UTILS -->
<script src="../bower_components/exi-ui-utils/js/bui.js"></script>
<script src="../bower_components/exi-ui-utils/js/dygraphwidget.js"></script>
<script src="../bower_components/exi-ui-utils/js/event.js"></script>
<script src="../bower_components/exi-ui-utils/js/imageutils.js"></script>
<script src="../bower_components/exi-ui-utils/js/progressbar.js"></script>
<script src="../bower_components/exi-ui-utils/js/string.js"></script>



<!-- ISPYB-JS-API -->
<script src="../bower_components/ispyb-js-api/js/dataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/event.js"></script>
<script src="../bower_components/ispyb-js-api/js/exi/exidataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/exi/exidataadaptergroup.js"></script>
<script src="../bower_components/ispyb-js-api/js/security/authenticationdataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/proposal/dataadapterfactory.js"></script>
<script src="../bower_components/ispyb-js-api/js/proposal/dewardataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/proposal/labcontactdataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/proposal/proposaldataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/proposal/proposaldataadaptergroup.js"></script>
<script src="../bower_components/ispyb-js-api/js/proposal/sessiondataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/proposal/shippingdataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/mx/autoprocintegrationdataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/mx/crystaldataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/mx/datacollectiondataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/mx/datacollectiongroupdataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/mx/energyscandataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/mx/mxdataadapterfactory.js"></script>
<script src="../bower_components/ispyb-js-api/js/mx/mxdataadaptergroup.js"></script>
<script src="../bower_components/ispyb-js-api/js/mx/phasingdataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/mx/proteindataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/mx/sampledataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/mx/statisticsdataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/mx/workflowdataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/mx/workflowstepdataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/mx/xfescandataadapter.js"></script>view-source:http://lindemaria:8082/EXI/test/dev.html#/welcome
<script src="../bower_components/ispyb-js-api/js/saxs/buffersaxsdataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/saxs/datacollectionsaxsdataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/saxs/experiment.js"></script>
<script src="../bower_components/ispyb-js-api/js/saxs/experimentlist.js"></script>
<script src="../bower_components/ispyb-js-api/js/saxs/experimentsaxsdataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/saxs/framesaxsdataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/saxs/hplcsaxsdataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/saxs/macromoleculesaxsdataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/saxs/measurementsaxsdataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/saxs/modelsaxsdataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/saxs/saxsdataadapterfactory.js"></script>
<script src="../bower_components/ispyb-js-api/js/saxs/saxsdataadaptergroup.js"></script>
<script src="../bower_components/ispyb-js-api/js/saxs/specimensaxsdataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/saxs/stocksolutionsaxsdataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/saxs/subtractionsaxsdataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/saxs/templatesaxsdataadapter.js"></script>




view-source:http://lindemaria:8082/EXI/test/dev.html#/welcome


<!-- DUST -->
<script src="../js/dust/helpers.js"></script>
Expand Down
57 changes: 7 additions & 50 deletions tracking/dev.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@

<!-- bower:js -->
<script src="../bower_components/jquery/dist/jquery.js"></script>
<script src="../bower_components/zeroclipboard/dist/ZeroClipboard.js"></script>
<script src="../bower_components/moment/moment.js"></script>
<script src="../bower_components/pikaday/pikaday.js"></script>
<script src="../bower_components/handsontable/dist/handsontable.js"></script>
Expand All @@ -49,7 +48,6 @@
<script src="../bower_components/notifyjs/dist/notify.js"></script>
<script src="../bower_components/bootstrap-multiselect/dist/js/bootstrap-multiselect.js"></script>
<script src="../bower_components/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js"></script>
<script src="../bower_components/file-saver/FileSaver.js"></script>
<script src="../bower_components/html-docx-js/dist/html-docx.js"></script>
<!-- endbower -->

Expand All @@ -59,57 +57,16 @@


<!-- EXI-UI-UTILS -->
<script src="../bower_components/exi-ui-utils/js/bui.js"></script>
<script src="../bower_components/exi-ui-utils/js/dygraphwidget.js"></script>
<script src="../bower_components/exi-ui-utils/js/event.js"></script>
<script src="../bower_components/exi-ui-utils/js/imageutils.js"></script>
<script src="../bower_components/exi-ui-utils/js/progressbar.js"></script>
<script src="../bower_components/exi-ui-utils/js/string.js"></script>



<!-- ISPYB-JS-API -->
<script src="../bower_components/ispyb-js-api/js/dataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/event.js"></script>
<script src="../bower_components/ispyb-js-api/js/exi/exidataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/exi/exidataadaptergroup.js"></script>
<script src="../bower_components/ispyb-js-api/js/security/authenticationdataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/proposal/dataadapterfactory.js"></script>
<script src="../bower_components/ispyb-js-api/js/proposal/dewardataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/proposal/labcontactdataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/proposal/proposaldataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/proposal/proposaldataadaptergroup.js"></script>
<script src="../bower_components/ispyb-js-api/js/proposal/sessiondataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/proposal/shippingdataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/mx/autoprocintegrationdataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/mx/crystaldataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/mx/datacollectiondataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/mx/datacollectiongroupdataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/mx/energyscandataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/mx/mxdataadapterfactory.js"></script>
<script src="../bower_components/ispyb-js-api/js/mx/mxdataadaptergroup.js"></script>
<script src="../bower_components/ispyb-js-api/js/mx/phasingdataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/mx/proteindataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/mx/sampledataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/mx/statisticsdataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/mx/workflowdataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/mx/workflowstepdataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/mx/xfescandataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/saxs/buffersaxsdataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/saxs/datacollectionsaxsdataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/saxs/experiment.js"></script>
<script src="../bower_components/ispyb-js-api/js/saxs/experimentlist.js"></script>
<script src="../bower_components/ispyb-js-api/js/saxs/experimentsaxsdataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/saxs/framesaxsdataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/saxs/hplcsaxsdataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/saxs/macromoleculesaxsdataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/saxs/measurementsaxsdataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/saxs/modelsaxsdataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/saxs/saxsdataadapterfactory.js"></script>
<script src="../bower_components/ispyb-js-api/js/saxs/saxsdataadaptergroup.js"></script>
<script src="../bower_components/ispyb-js-api/js/saxs/specimensaxsdataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/saxs/stocksolutionsaxsdataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/saxs/subtractionsaxsdataadapter.js"></script>
<script src="../bower_components/ispyb-js-api/js/saxs/templatesaxsdataadapter.js"></script>








<!-- DUST -->
Expand Down