Permalink
Browse files

Merge branch 'develop' of https://github.com/tlabczbrown/cypress into…

… develop
  • Loading branch information...
2 parents 11d3b42 + 454ad67 commit 357aded51b7c89753dd1d0641a1ecd756805045c @rdingwell rdingwell committed Jul 16, 2012
@@ -43,25 +43,22 @@
};
$.testWizard.updateProgressBar = function(screen) {
- $('#step1,#step2,#step3,#step4').removeClass('complete current incomplete').addClass('incomplete');
switch (screen) {
case "first":
- $('#step1').removeClass('incomplete').addClass('current');
+ $('#currentStep').html(1);
+ $('#back').addClass('disabled').find('input').attr('disabled',true).css("color","silver");
break;
case "wizard-measures-screen":
- $('#step1').removeClass('incomplete').addClass('complete');
- $('#step2').removeClass('incomplete').addClass('current');
+ $('#currentStep').html(2);
+ $('#back').removeClass('disabled').find('input').removeAttr('disabled').css("color","green");
break;
case "wizard-workflow-screen":
- $('#step1,#step2').removeClass('incomplete').addClass('complete');
- $('#step3').removeClass('incomplete').addClass('current');
+ $('#currentStep').html(3);
break;
-
case "wizard-patients-automated-screen":
case "wizard-patients-manual-screen":
case "wizard-patients-byod-screen":
- $('#step1,#step2,#step3').removeClass('incomplete').addClass('complete');
- $('#step4').removeClass('incomplete').addClass('current');
+ $('#currentStep').html(4);
break;
}
}
@@ -92,32 +89,6 @@ $(document).ready(function() {
$('[name=population_name]').addClass("required");
});
- // for choosing the workflow option
- $('label').hover(function(){
- $(this).parent().addClass('highlight')
- },
- function(){
- $(this).parent().removeClass('highlight')
- }
- ).click(function(){
- var self = this;
- $.each(['wf1','wf2','wf3'], function(i,e) {
- $('.'+e+'_container').removeClass('selectedWorkflow');
- });
- $(this).parent().addClass('selectedWorkflow');
- });
-
- // for determining the download filename
- $('#wf2').click(function(){
- $('#html,label[for="html"]').hide();
- $('#c32').attr('checked',true);
- $('#c32,#ccr,label[for="c32"],label[for="ccr"]').show();
- });
- $('#wf1').click(function(){
- $('#c32,#ccr,label[for="c32"],label[for="ccr"]').hide();
- $('#html').attr('checked',true);
- $('#html,label[for="html"]').show();
- });
// set the default choice by invoking a click on workflow 2
$('label[for=wf2]').trigger("click");
@@ -156,8 +127,7 @@ $(document).ready(function() {
rules: {
"product_test[name]": "required",
"product_test[patient_population]": "required",
- "product_test[measure_ids][]": "required",
- "byod": "required"
+ "product_test[measure_ids][]": "required"
},
errorClass: "validationErrors",
messages: {
@@ -169,9 +139,6 @@ $(document).ready(function() {
},
"product_test[measure_ids][]": {
required:"You must choose at least one quality measure."
- },
- "byod": {
- required:"You must provide a .zip file containing your patient records."
}
},
errorPlacement: function(error, element) {
@@ -206,6 +173,7 @@ $(document).ready(function() {
cache = {}; // empty the cache again
}
});
+ $.testWizard.updateProgressBar("first");
$('.edit_product_test').validate({
rules: {
"product_test[name]": "required"
@@ -150,7 +150,7 @@ div.stacked{
}
section.tb {
- a.cmd {float:right;margin-left:15px;}
+ a.cmd {float:right;margin-left:15px;width:102px;}
}
nav.breadcrumb {
font-size:80%;
@@ -1100,7 +1100,6 @@ input.valid,textarea.valid {background:#DEFADE;}
#mm_edit {
text-align: center;
}
-
#outcomeMeasures {
width: 500px;
display: table-cell;
@@ -1121,4 +1120,11 @@ input.valid,textarea.valid {background:#DEFADE;}
background-color: #9db26d;
width: auto;
.paramGroup {
- background-color: #68822c; } } } }
+ background-color: #68822c; } } } }
+
+#wizard-workflow-screen label {
+ font-weight:bold;
+}
+#wizard-workflow-screen .description {
+ margin-left: 3em;
+}
@@ -2,18 +2,16 @@
<style type="text/css">
/* formwizard and validation */
.navigation_button {
- width : 70px;
+ width : 0px;
}
.highlight {background:#DEFADE;}
- .step {height:37em;}
-
+
td {vertical-align: top;}
p {padding:5px;}
#navigation {
- margin-top : 0.5em;
- margin-right : 1em;
- text-align: center;
- padding-bottom: 1em;
+ padding-top: .2em;
+ text-align:right;
+ width:100%;
}
textarea {
-moz-border-radius: 5px;
@@ -22,60 +20,48 @@
padding: 4px;
border: 1px solid #AAAAAA;
}
- #navigation .noborder {border: 0;color:green;background:transparent;}
- .link {
- height:5em;
- padding:1em;
+ #navigation input.noborder {
+ border: 0;
+ color:green;
+ background:transparent;
+ display:inline;
}
+ /* need to override the CSS rule for spans that occur within forms
+ which is set to block (?!)
+ */
+ #navigation span.status {
+ display:inline;
+}
.left {float: left;clear:left;}
.right {float: right;clear:right;}
input[type=radio] {display:inline-block;}
dd.wide, span.wide {
width: 45em;
}
- /* vertical tabs */
+ /* vertical tabs */
.ui-tabs-vertical { width: 55em; }
.ui-tabs-vertical .ui-tabs-nav { padding: .2em .1em .2em .2em; float: left; width: 12em; }
.ui-tabs-vertical .ui-tabs-nav li { clear: left; width: 100%; border-bottom-width: 1px !important; border-right-width: 0 !important; margin: 0 -1px .2em 0; }
.ui-tabs-vertical .ui-tabs-nav li a { display:block; }
.ui-tabs-vertical .ui-tabs-nav li.ui-tabs-selected { padding-bottom: 0; padding-right: .1em; border-right-width: 1px; border-right-width: 1px; }
.ui-tabs-vertical .ui-tabs-panel { padding: .5em; float: right; width: 47em;}
- td span.incomplete {background:url(/assets/insufficient.png) 0 50% no-repeat;
- text-indent:-9999pt;width:16px;
- }
- td span.complete {background:url(/assets/included.png) 0 50% no-repeat;
- text-indent:-9999pt;width:16px;
- }
- td span.current {background:url(/assets/pass.png) 0 50% no-repeat;
- text-indent:-9999pt;width:16px;
- }
-
</style>
<% end %>
<%= simple_form_for([@test], :html => { :method => submit_method, :multipart => true }) do |f| %>
<%= f.hidden_field :product_id, :value => @product.id %>
- <div id="progress_bar" style="float:right;">
- <table><tr>
- <td>completed:</td>
- <td><span class="current" id="step1">1</span></td>
- <td><span class="incomplete" id="step2">2</span></td>
- <td><span class="incomplete" id="step3">3</span></td>
- <td><span class="incomplete" id="step4">4</span></td>
- </tr>
- </table>
+ <div id="navigation">
+ <a class="cmd" id="back"><input class="noborder" value="Back" type="reset" /></a>
+ <span class="status">Step <b id="currentStep">1</b> of 4</span>
+ <a class="cmd" id="next"><input class="noborder" value="Next" type="submit" /></a>
</div>
+ <div id="validationErrorMessages"></div>
<%= render :partial => "product_tests/wizard_screens/home", :locals => {:f => f} %>
<%= render :partial => "product_tests/wizard_screens/measures", :locals => {:f => f} %>
<%= render :partial => "product_tests/wizard_screens/workflow", :locals => {:f => f} %>
<%= render :partial => "product_tests/wizard_screens/patients", :locals => {:f => f} %>
- <div id="validationErrorMessages"></div>
- <div id="navigation">
- <a class="cmd" id="back"><input class="noborder" value="Back" type="reset" /></a>
- <a class="cmd" id="next"><input class="noborder" value="Next" type="submit" /> </a>
- </div>
<% end %>
@@ -1,5 +1,5 @@
<section id="first" class="step" style="width: 100%; overflow:auto;">
- <h2 class="ui-widget-title" style="margin-top: 20px;">Describe the test...</h2>
+ <h2 class="ui-widget-title">Describe the test...</h2>
<dl>
<dt>
<span style="float:right;">Test Name:</span><span id="required_asterisk">* </span>
@@ -7,7 +7,7 @@
<% end %>
<section id="wizard-measures-screen" class="step">
- <h2 class="ui-widget-title" style="margin-top: 20px;">Identify <strong>at least one</strong> quality measure to test from the list of available measures for this product...</h2>
+ <h2 class="ui-widget-title">Identify <strong>at least one</strong> quality measure to test from the list of available measures for this product...</h2>
<span class="header_commands" style="text-align:center;"><input type="checkbox" id="all_measures"/><label for="all_measures">all quality measures</label></span>
<div id="tabs">
<!-- set up a tab header for each measure group -->
@@ -15,7 +15,7 @@
<% end %>
<section id="wizard-patients-automated-screen" class="step submit_step">
- <h2 class="ui-widget-title" style="margin-top: 20px;">Select patient records to use...</h2>
+ <h2 class="ui-widget-title">Select patient records to use...</h2>
<section>
Cypress has two predefined patient populations to choose from - the full 225 or a subset of 20
designed to test the core and core alternate Stage 1 Clinical Quality Measures. In addition,
@@ -51,9 +51,7 @@
</section>
<section id="wizard-patients-manual-screen" class="step submit_step">
- <h2 class="ui-widget-title" style="margin-top: 20px;">Patient records to use for testing your chosen quality measures...</h2>
- <div id="measure_coverage" style="overflow:hidden;">
- </div>
+ <h2 class="ui-widget-title">Patient records to use for testing your chosen quality measures...</h2>
<section id="save_population">
<p>If you would like to save this patient population
for use in other tests, please give it a name and a brief description</p>
@@ -64,22 +62,6 @@
<dd><input type="text" name="population_description" size="80"/></dd>
</dl>
</section>
-</section>
-
-<section id="wizard-patients-byod-screen" class="step submit_step">
- <h2 class="ui-widget-title" style="margin-top: 20px;">Bring your own records...</h2>
- <dl>
- <dt><%= label_tag :byod_label, "upload .zip of records:" %></dt>
- <dd><%= file_field_tag :byod %></dd>
- </dl>
- <dl>
- <dt>as:</dt>
- <dd>
- <%= f.radio_button :upload_format, "c32",
- :checked => (@test[:upload_format] == nil || @test[:upload_format] == "c32") %>
- <%= f.label :upload_format_c32, "C32" %>
- <%= f.radio_button :upload_format, "ccr", :checked => @test[:upload_format] == "ccr"%>
- <%= f.label :upload_format_ccr, "CCR" %>
- </dd>
- </dl>
+ <div id="measure_coverage" style="overflow:hidden;">
+ </div>
</section>
@@ -1,54 +1,24 @@
<% content_for :head do %>
- <style type="text/css">
- p.workflow {
- border:1px solid #539309;
- -moz-border-radius:5px;
- -webkit-border-radius:5px;
- border-radius:5px;
- color:#539309;
- cursor:pointer;
- font-size:110%;
- text-align:center;
- width: 80%;
- margin-left:10%;
- }
- p.selectedWorkflow {
- font-weight:bold;
- background:#DEFADE;
- border:1px solid green;
- }
- #wizard-workflow-screen label {
- padding: 2em;
- }
-
- .wf1_container, .wf2_container, .wf3_container {
- position:relative;
- }
- </style>
<% end %>
<section id="wizard-workflow-screen" class="step">
- <h2 style="margin-top: 20px;">Please select a workflow option...</h2>
- <section>
- <p class="wf2_container workflow">
- <input type="radio" id="wf2" name="workflow" class="link" value="wizard-patients-automated-screen" style="display:none;"/>
- <label for="wf2"><em>C32/CCR Export</em><br/>
- The Cypress Test Deck will be exported in HITSP C32 or ASTM CCR XML format and imported into an EHR software product or module.
- </label>
- </p>
- <br/>
- <p class="wf1_container workflow">
- <input type="radio" id="wf1" name="workflow" class="link" value="wizard-patients-manual-screen" style="display:none;"/>
- <label for="wf1"><em>HTML Export</em><br/>
- The Cypress Test Deck will be exported in HTML format and input into an EHR software product or module.
- </label>
- </p>
- <br/>
- <p class="wf3_container workflow">
- <input type="radio" id="wf3" name="workflow" class="link" value="wizard-patients-byod-screen" style="display:none;"/>
- <label for="wf3"><em>C32/CCR Upload</em><br/>
- Exported HITSP C32 or ASTM CCR XML formatted patient records will be uploaded to Cypress in lieu of the Test Deck for this test.
- </label>
- </p>
- </section>
+ <h2>Please select a workflow option...</h2>
+ <p>
+ <input type="radio" id="wf2" class="link" name="workflow" value="wizard-patients-automated-screen"/>
+ <label for="wf2">The patient data will be <em>imported</em> by the EHR</label>
+ </p>
+ <p class="description">
+ Cypress will export the Test Deck patient records in HITSP C32 or ASTM CCR XML format so that you can
+ import them with your EHR software product or module. Select this option if the software you'll be testing
+ supports an automated import of patient data.
+ </p>
+ <p>
+ <input type="radio" id="wf1" class="link" name="workflow" value="wizard-patients-manual-screen"/>
+ <label for="wf1">The patient data will be entered <em>by hand</em></label>
+ </p>
+ <p class="description">
+ Cypress will export the Test Deck patient records in HTML format so that you can reference them
+ when doing the data entry to an EHR software product or module. Select this option if someone
+ on your team will need to enter the data manually.
+ </p>
</section>

0 comments on commit 357aded

Please sign in to comment.