details: http://www.bx.psu.edu/hg/galaxy/rev/52edc83ed81c changeset: 3415:52edc83ed81c user: rc date: Thu Feb 18 21:38:49 2010 -0500 description: lims: - added data directory field in sequencer info - UI changes on samples page diffstat: lib/galaxy/web/controllers/requests_admin.py | 9 +++++++-- templates/admin/requests/create_request_type.mako | 4 ++++ templates/admin/requests/show_request.mako | 12 ++++++++---- templates/admin/requests/view_request_type.mako | 4 ++++ templates/requests/show_request.mako | 11 +++++++---- 5 files changed, 30 insertions(+), 10 deletions(-) diffs (164 lines): diff -r c280939fd48d -r 52edc83ed81c lib/galaxy/web/controllers/requests_admin.py --- a/lib/galaxy/web/controllers/requests_admin.py Thu Feb 18 17:04:43 2010 -0500 +++ b/lib/galaxy/web/controllers/requests_admin.py Thu Feb 18 21:38:49 2010 -0500 @@ -1370,10 +1370,14 @@ status='error', message="Invalid sample ID", **kwd) ) + if sample.request.type.datatx_info.get('data_dir', ''): + folder_path = util.restore_text( sample.request.type.datatx_info.get('data_dir', '') ) + else: + folder_path = util.restore_text( params.get( 'folder_path', '' ) ) return trans.fill_template( '/admin/requests/get_data.mako', sample=sample, dataset_files=sample.dataset_files, msg=msg, messagetype=messagetype, files=[], - folder_path=util.restore_text( params.get( 'folder_path', '' ) )) + folder_path=folder_path ) def __get_files(self, trans, sample, folder_path): ''' This method retrieves the filenames to be transfer from the remote host. @@ -1687,7 +1691,8 @@ # data transfer info rt.datatx_info = dict(host=util.restore_text( params.get( 'host', '' ) ), username=util.restore_text( params.get( 'username', '' ) ), - password=util.restore_text( params.get( 'password', '' ) )) + password=util.restore_text( params.get( 'password', '' ) ), + data_dir=util.restore_text( params.get( 'data_dir', '' ) )) trans.sa_session.add( rt ) trans.sa_session.flush() return trans.response.send_redirect( web.url_for( controller='requests_admin', diff -r c280939fd48d -r 52edc83ed81c templates/admin/requests/create_request_type.mako --- a/templates/admin/requests/create_request_type.mako Thu Feb 18 17:04:43 2010 -0500 +++ b/templates/admin/requests/create_request_type.mako Thu Feb 18 21:38:49 2010 -0500 @@ -66,6 +66,10 @@ <input type="password" name="password" value="" size="40"/> </div> <div class="form-row"> + <label>Data directory:</label> + <input type="text" name="data_dir" value="" size="40"/> + </div> + <div class="form-row"> <div style="float: left; width: 250px; margin-right: 10px;"> <input type="hidden" name="new" value="submitted" size="40"/> </div> diff -r c280939fd48d -r 52edc83ed81c templates/admin/requests/show_request.mako --- a/templates/admin/requests/show_request.mako Thu Feb 18 17:04:43 2010 -0500 +++ b/templates/admin/requests/show_request.mako Thu Feb 18 21:38:49 2010 -0500 @@ -43,7 +43,7 @@ </script> <style type="text/css"> .msg_head { - padding: 10px 0px; + padding: 0px 0px; cursor: pointer; } @@ -134,7 +134,7 @@ <th>Data Library</th> <th>Folder</th> %if request.submitted() or request.complete(): - <th>Dataset(s)</th> + <th>Dataset(s) Transfered</th> %endif <th></th> </tr> @@ -252,7 +252,7 @@ <div class="toolForm"> <div class="form-row"> <div class="msg_list"> - <h4 class="msg_head">Request Information</h4> + <h4 class="msg_head"><u>Request Information</u></h4> <div class="msg_body"> %for index, rd in enumerate(request_details): <div class="form-row"> @@ -282,11 +282,14 @@ </div> </div> +<br/> + <%def name="render_grid( grid_index, grid_name, fields_dict )"> + <br/> <div class="msg_list"> %if grid_name: - <h4 class="msg_head">${grid_name}</h4> + <h4 class="msg_head"><u>${grid_name}</u></h4> %else: <h4>Grid ${grid_index}</h4> %endif @@ -346,6 +349,7 @@ <% trans.sa_session.refresh( request.type.sample_form ) %> %for grid_index, grid_name in enumerate(request.type.sample_form.layout): ${render_grid( grid_index, grid_name, request.type.sample_form.fields_of_grid( grid_index ) )} + <br/> %endfor %else: <label>There are no samples.</label> diff -r c280939fd48d -r 52edc83ed81c templates/admin/requests/view_request_type.mako --- a/templates/admin/requests/view_request_type.mako Thu Feb 18 17:04:43 2010 -0500 +++ b/templates/admin/requests/view_request_type.mako Thu Feb 18 21:38:49 2010 -0500 @@ -58,6 +58,10 @@ <input type="password" name="password" value="${request_type.datatx_info['password']}" size="40"/> </div> <div class="form-row"> + <label>Data directory:</label> + <input type="text" name="data_dir" value="${request_type.datatx_info.get('data_dir', '')}" size="40"/> + </div> + <div class="form-row"> <input type="submit" name="save_changes" value="Save changes"/> </div> </form> diff -r c280939fd48d -r 52edc83ed81c templates/requests/show_request.mako --- a/templates/requests/show_request.mako Thu Feb 18 17:04:43 2010 -0500 +++ b/templates/requests/show_request.mako Thu Feb 18 21:38:49 2010 -0500 @@ -44,7 +44,7 @@ </script> <style type="text/css"> .msg_head { - padding: 15px 0px; + padding: 0px 0px; cursor: pointer; } @@ -124,7 +124,7 @@ <th>Data Library</th> <th>Folder</th> %if request.submitted() or request.complete(): - <th>Dataset(s)</th> + <th>Dataset(s) Transfered</th> %endif <th></th> </tr> @@ -240,7 +240,7 @@ <div class="toolForm"> <div class="form-row"> <div class="msg_list"> - <h4 class="msg_head">Request Information</h4> + <h4 class="msg_head"><u>Request Information</u></h4> <div class="msg_body"> %for index, rd in enumerate(request_details): <div class="form-row"> @@ -269,11 +269,13 @@ </div> </div> </div> +<br/> <%def name="render_grid( grid_index, grid_name, fields_dict )"> + <br/> <div class="msg_list"> %if grid_name: - <h4 class="msg_head">${grid_name}</h4> + <h4 class="msg_head"><u>${grid_name}</u></h4> %else: <h4>Grid ${grid_index}</h4> %endif @@ -333,6 +335,7 @@ <% trans.sa_session.refresh( request.type.sample_form ) %> %for grid_index, grid_name in enumerate(request.type.sample_form.layout): ${render_grid( grid_index, grid_name, request.type.sample_form.fields_of_grid( grid_index ) )} + <br/> %endfor %else: <label>There are no samples.</label>