Micro: Updated Experimental Results & Set Up forms

www/app/data-models/micro/experimental-results-choices.csv

@@ -1,12 +1,14 @@
 list_name,name,label
+cd92o31,no,No
+cd92o31,yes,Yes
 db35g43,psi,Psi
 db35g43,bar,bar
 db35g43,kbar,Kbar
 db35g43,mpa,MPa
 cz56k16,cm,cm
 cz56k16,mm,mm
 cz56k16,in,in
-zl4gw87,cubeblok,Cube/block
+zl4gw87,cube_block,Cube/block
 zl4gw87,core,Core
 zl4gw87,other,Other
 ik38x60,cm,cm

www/app/data-models/micro/experimental-results-survey.csv

@@ -1,25 +1,29 @@
 type,name,label,required,appearance,relevant,calculation
 start,start,,,,,
 end,end,,,,,
-decimal,Peak_Differential_Stress,Peak Differential Stress,false,,,
-decimal,Peak_Differential_Force,Peak Differential Force,false,,,
-select_one db35g43,Force_Units,Force Units,false,compact,,
-decimal,Coefficient_of_Friction,Coefficient of Friction,false,,,
-decimal,Shear_Displacement,Shear Displacement,false,,,
-select_one cz56k16,Shear_Displacement_Units,Shear Displacement Units,false,compact,,
+text,outcome_conclusions,Outcome/Conclusions,false,multiline,,
+select_one cd92o31,leak,Leak?,false,horizontal-compact,,
+text,leak_location,Leak Location,false,,${leak} = 'yes',
+decimal,peak_differential_stress,Peak Differential Stress,false,,,
+decimal,peak_differential_force,Peak Differential Force,false,,,
+select_one db35g43,force_units,Force Units,false,compact,,
+decimal,coefficient_of_friction,Coefficient of Friction,false,,,
+decimal,shear_displacement,Shear Displacement,false,,,
+select_one cz56k16,shear_displacement_units,Shear Displacement Units,false,compact,,
 begin_group,group_pn2ld79,Final Sample Dimensions,,,,
-select_one zl4gw87,Sample_Geometry,Sample Geometry,false,,,
-decimal,Maximum_Final_Diameter,Maximum Final Diameter,false,,${Sample_Geometry} = 'core',
-decimal,Minimum_Final_Diameter,Minimum Final Diameter,false,,${Sample_Geometry} = 'core',
-select_one ik38x60,Diameter_Units,Diameter Units,false,compact,${Sample_Geometry} = 'core',
-decimal,Final_Length,Final Length,false,,${Sample_Geometry} = 'core',
-select_one hz7ux28,Length_Units,Length Units,false,compact,${Sample_Geometry} = 'core',
-decimal,Displacement,Displacement,false,,${Sample_Geometry} = 'core',
-select_one vi6ad98,Displacement_Units,Displacement Units,false,compact,${Sample_Geometry} = 'core',
-decimal,Length,Length,false,,${Sample_Geometry} = 'cubeblok',
-decimal,Width,Width,false,,${Sample_Geometry} = 'cubeblok',
-decimal,Height,Height,false,,${Sample_Geometry} = 'cubeblok',
-select_one hy2bf71,Units,Units,false,,${Sample_Geometry} = 'cubeblok',
-text,Other_Final_Sample_Geometry,Other Final Sample Geometry,false,,${Sample_Geometry} = 'other',
+text,mode_of_failure,Mode of Failure,false,,,
+select_one zl4gw87,sample_geometry,Sample Geometry,false,,,
+decimal,maximum_final_diameter,Maximum Final Diameter,false,,${sample_geometry} = 'core',
+decimal,minimum_final_diameter,Minimum Final Diameter,false,,${sample_geometry} = 'core',
+select_one ik38x60,diameter_units,Diameter Units,false,compact,${sample_geometry} = 'core',
+decimal,final_length,Final Length,false,,${sample_geometry} = 'core',
+select_one hz7ux28,length_units,Length Units,false,compact,${sample_geometry} = 'core',
+decimal,displacement,Displacement,false,,${sample_geometry} = 'core',
+select_one vi6ad98,displacement_units,Displacement Units,false,compact,${sample_geometry} = 'core',
+decimal,length,Length,false,,${sample_geometry} = 'cube_block',
+decimal,width,Width,false,,${sample_geometry} = 'cube_block',
+decimal,height,Height,false,,${sample_geometry} = 'cube_block',
+select_one hy2bf71,units,Units,false,,${sample_geometry} = 'cube_block',
+text,other_final_sample_geometry,Other Final Sample Geometry,false,,${sample_geometry} = 'other',
 end_group,,,,,,
-calculate,__version__,,,,,'vWf5Rw3cV4LbCePCoiFRpQ'
+calculate,__version__,,,,,'vCk9X7YkC6GhAxwv85Rxyy'

www/app/data-models/micro/experimental-set-up-choices.csv

@@ -1,51 +1,66 @@
 list_name,name,label,order
-qn6uc31,gas,Gas,
-qn6uc31,solid,Solid,
-qn6uc31,liquid,Liquid,
-qn6uc31,other,Other,
-wj1rj37,strain_gauge,Strain Gauge,
-wj1rj37,distortion,Piezoelectric,1
-wj1rj37,displacement,LVDT,2
-wj1rj37,dcdt,DCDT,3
-wj1rj37,temperature,Temperature,4
-wj1rj37,force_gauge,Force Gauge,5
-wj1rj37,pressure,Pressure,6
-wj1rj37,other,Other,
-qm35l04,single,Single,
-qm35l04,double,Double,1
-qm35l04,none,None,2
-qm35l04,other,Other,3
-uj2sg83,gold,Gold,
-uj2sg83,silver,Silver,
-uj2sg83,copper,Copper,
-uj2sg83,lead,Lead,
-uj2sg83,teflon,Teflon,
-uj2sg83,polyolefin,Polyolefin,
-uj2sg83,other,Other,
-zg3fl49,constant_stress_test,Constant Stress Test,
-zg3fl49,constant_strain_rate_test,Constant Strain Rate Test,
-zg3fl49,load_relaxation,Load Relaxation,
-zg3fl49,stepping_tests,Stepping Tests,
-zg3fl49,other,Other,
-gi5pp37,c,C,
-gi5pp37,mpa_1,bar,
-gi5pp37,mpa,MPa,1
-gi5pp37,kbar_1,kbar,1
-gi5pp37,k,K,2
-gi5pp37,torr,torr,2
-gi5pp37,mpa_2,MPa,2
-gi5pp37,kbar,kbar,
-gi5pp37,torr_1,torr,
-gi5pp37,psi,Psi,
-gi5pp37,kbar_2,kbar,1
-gi5pp37,mpa_3,MPa,2
-or1gv41,uniaxial,Uniaxial,
-or1gv41,biaxial,Biaxial,
-or1gv41,conventional_triaxial,Conventional Triaxial,
-or1gv41,full_triaxial,Full Triaxial,
-or1gv41,rotary,Rotary,
-or1gv41,direct_shear,Direct shear,
-or1gv41,precut_shear__30_or_45_degrees,Precut shear (30 or 45 degrees),
-or1gv41,general_shear,General Shear,
-or1gv41,double_direct_shear,Double-direct shear,
-or1gv41,other,Other,
+ck0ni31,gas,Gas,
+ck0ni31,solid,Solid,
+ck0ni31,liquid,Liquid,
+ck0ni31,other,Other,
+em3fy79,strain_gauge,Strain Gauge,
+em3fy79,piezoelectric,Piezoelectric,
+em3fy79,lvdt,LVDT,
+em3fy79,dcdt,DCDT,
+em3fy79,temperature,Temperature,
+em3fy79,force_gauge,Force Gauge,
+em3fy79,pressure,Pressure,
+em3fy79,other,Other,
+mu7bg28,single,Single,
+mu7bg28,double,Double,1
+mu7bg28,none,None,2
+mu7bg28,other,Other,3
+nu2up86,gold,Gold,
+nu2up86,silver,Silver,
+nu2up86,copper,Copper,
+nu2up86,lead,Lead,
+nu2up86,teflon,Teflon,
+nu2up86,polyolefin,Polyolefin,
+nu2up86,other,Other,
+hj1em57,gold,Gold,
+hj1em57,silver,Silver,
+hj1em57,copper,Copper,
+hj1em57,lead,Lead,
+hj1em57,teflon,Teflon,
+hj1em57,polyolefin,Polyolefin,
+hj1em57,other,Other,
+gx7ns27,mpa,MPa,
+gx7ns27,bar,bar,
+gx7ns27,psi,psi,
+gx7ns27,torr,torr,
+gx7ns27,other,other,
+ba9ne27,mpa,MPa,
+ba9ne27,bar,bar,
+ba9ne27,atm,atm,
+ba9ne27,psi,psi,
+ba9ne27,torr,torr,
+ba9ne27,other,Other,
+vb63e62,mpa,MPa,
+vb63e62,bar,bar,
+vb63e62,atm,atm,
+vb63e62,psi,psi,
+vb63e62,torr,torr,
+vb63e62,other,Other,
+sq7ei65,mpa,MPa,
+sq7ei65,psi,psi,
+sq7ei65,other,Other,
+sj9gf54,const_stress_t,Constant Stress Test,
+sj9gf54,const_strain_r,Constant Strain Rate Test,
+sj9gf54,load_relaxatio,Load Relaxation,
+sj9gf54,stepping_tests,Stepping Tests,
+sj9gf54,other,Other,
+ev7qo75,uniaxial,Uniaxial,
+ev7qo75,biaxial,Biaxial,
+ev7qo75,conv_triaxial,Conventional Triaxial,
+ev7qo75,full_triaxial,Full Triaxial,
+ev7qo75,rotary,Rotary,
+ev7qo75,direct_shear,Direct Shear,
+ev7qo75,precut_shear,Precut Shear (30 or 45 degrees),
+ev7qo75,general_shear,General Shear,
+ev7qo75,dbl_dir_shear,Double Direct Shear,
+ev7qo75,other,Other,

www/app/data-models/micro/experimental-set-up-survey.csv

@@ -1,58 +1,63 @@
-type,name,label,required,relevant,default,appearance,calculation
-begin_group,group_lq9wr93,Experimental,,,,,
-text,Attach_Apparatus_Tag,Attach Apparatus Tag,false,,,,
-begin_group,group_gm3pu13,Apparatus Information,,${Attach_Apparatus_Tag} = '',,,
-select_one qn6uc31,Apparatus,Apparatus,false,,,,
-text,If_Other_Describe_005,"If Other, Describe",false,${Apparatus} = 'other',,,
-text,Gas_Specify,Gas-Specify,false,${Apparatus} = 'gas',,,
-text,Liquid_Specify,Liquid-Specify,false,${Apparatus} = 'liquid',,,
-text,Solid_Specify,Solid-Specify,false,${Apparatus} = 'solid',,,
-text,Apparatus_Stiffness,Apparatus Stiffness,false,,,,
-select_multiple wj1rj37,Types_of_Devices_Transducers,Types of Devices/Transducers,false,,,,
-text,If_Other_Describe_006,"If Other, Describe",false,"selected(${Types_of_Devices_Transducers}, 'other')",,,
-text,Type_of_Temperature_Device,Type of Temperature Device,false,"selected(${Types_of_Devices_Transducers}, 'temperature')",,,
-text,Type_of_Force_Gauge,Type of Force Gauge,false,"selected(${Types_of_Devices_Transducers}, 'force_gauge')",,,
-text,Type_of_Pressure_Transducer,Type of Pressure Transducer,false,"selected(${Types_of_Devices_Transducers}, 'pressure')",,,
-text,Strain_Gauge_Calibration,Strain Gauge Calibration,false,"selected(${Types_of_Devices_Transducers}, 'strain_gauge')",,,
-text,Piezoelectric_Calibration,Piezoelectric Calibration,false,"selected(${Types_of_Devices_Transducers}, 'distortion')",,,
-text,LVDT_Calibration,LVDT Calibration,false,"selected(${Types_of_Devices_Transducers}, 'displacement')",,,
-text,DCDT,DCDT Calibration,false,"selected(${Types_of_Devices_Transducers}, 'dcdt')",,,
-text,Temp_Calibration,Temperature Calibration,false,"selected(${Types_of_Devices_Transducers}, 'temperature')",,,
-text,Force_Gauge_Calibration,Force Gauge Calibration,false,"selected(${Types_of_Devices_Transducers}, 'force_gauge')",,,
-text,Pressure_Transducer_Calibration,Pressure Transducer Calibration,false,"selected(${Types_of_Devices_Transducers}, 'pressure')",,,
-end_group,,,,,,,
-select_one qm35l04,Jacket_Type,Jacket Type,false,,,,
-text,If_Other_Describe_007,"If Other, Describe",false,${Jacket_Type} = 'other',,,
-select_one uj2sg83,Jacket_Material,Jacket Material,false,${Jacket_Type} != 'none',,,
-text,If_Other_Describe_008,"If Other, Describe",false,${Jacket_Material} = 'other',,,
-text,Experimental_Setup_Description,Experimental Setup Description,false,,,,
-select_one zg3fl49,Type_of_experiment,Type of Experiment,false,,,,
-text,If_Other_Describe_009,"If Other, Describe",false,${Type_of_experiment} = 'other',,,
-note,Experimental_Conditions,Experimental Conditions,false,,,,
-note,Experimental_Pressure,Experimental Pressure,false,,,,
-decimal,Pressure,Pressure,false,,,,
-select_one gi5pp37,Pressure_Units,Pressure Units,false,,MPa,minimal,
-note,Pore_Pressure,Pore Pressure,false,,,,
-decimal,Pore_Pressure_001,Pore Pressure,false,,,,
-select_one gi5pp37,Pore_Pressure_Units,Pore Pressure Units,true,,MPa,minimal,
-decimal,Effective_Pressure,Effective Pressure,false,,,,
-select_one gi5pp37,Effective_Pressure_Units,Effective Pressure Units,false,,MPa,minimal,
-text,If_Other_Describe_012,"If Other, Describe",false,,,,
-text,Effective_Pressure_001,Effective Pressure,false,,,,
-integer,Temperature,Temperature,false,,,,
-select_one gi5pp37,Temperature_Units,Temperature Units,false,,C,minimal,
-text,Temperature_001,Temperature,false,,,,
-decimal,Strain_Rate,Strain Rate,false,,,,
-text,Strain_rate_001,Strain rate,false,,,,
-decimal,Differential_Stress,Differential Stress,false,,,,
-select_one gi5pp37,Differential_Stress_Units,Differential Stress Units,false,,Psi,minimal,
-text,Differential_stress_001,Differential stress,false,,,,
-text,Other_Conditions,Other Conditions,false,,,,
-select_one or1gv41,Experimental_Geometry,Experimental Geometry,false,,,,
-text,If_other_describe_013,"If other, describe",false,${Experimental_Geometry} = 'other',,,
-note,Sample_orientation_r_o_experimental_setup,Sample orientation relative to experimental setup,false,,,,
-text,Before_Experiment,Before Experiment,false,,,,
-text,After_Experiment,After Experiment,false,,,,
-text,Experimental_Set_Up_Description,Experimental Set Up Description,false,,,,
-end_group,,,,,,,
-calculate,__version__,,,,,,'vGdwoo3u27CHtu6xA3oZDP'
+type,name,label,hint,required,appearance,relevant,default,calculation
+start,start,,,,,,,
+end,end,,,,,,,
+text,name_of_experiment,Name Of Experiment,,true,,,,
+date,date_of_experiment,Date of Experiment,,true,,,,
+text,operator_name,Operator Name,,true,,,,
+text,experiment_purpose,Experiment Purpose,,true,multiline,,,
+text,experiment_procedure,Experiment Procedure,,true,multiline,,,
+text,attach_apparatus_tag,Attach Apparatus Tag,,false,,,,
+begin_group,apparatus_info,Apparatus Information,,,,${attach_apparatus_tag} = '',,
+select_one ck0ni31,apparatus,Apparatus,,false,,,,
+text,other_apparatus_specify,Other Apparatus- Specify,,false,multiline,${apparatus} = 'other',,
+text,gas_specify,Gas- Specify,,false,multiline,${apparatus} = 'gas',,
+text,solid_specify,Solid- Specify,,false,multiline,${apparatus} = 'solid',,
+text,liquid_specify,Liquid- Specify,,false,multiline,${apparatus} = 'liquid',,
+text,apparatus_stiffness,Apparatus Stiffness,,false,,,,
+select_multiple em3fy79,types_of_devices_transducers,Types of Devices/Transducers,,false,horizontal-compact,,,
+text,strain_gauge_calibration,Strain Gauge Calibration,,false,,"selected(${types_of_devices_transducers}, 'strain_gauge')",,
+text,piezoelectric_calibration,Piezoelectric Calibration,,false,,"selected(${types_of_devices_transducers}, 'piezoelectric')",,
+text,lvdt_calibration,LVDT Calibration,,false,,"selected(${types_of_devices_transducers}, 'lvdt')",,
+text,dcdt_calibration,DCDT Calibration,,false,,"selected(${types_of_devices_transducers}, 'dcdt')",,
+text,type_of_temp_device,Type of Temperature Device,,false,,"selected(${types_of_devices_transducers}, 'temperature')",,
+text,temp_device_calibration,Temperature Device Calibration,,false,,"selected(${types_of_devices_transducers}, 'temperature')",,
+text,force_gauge_type,Force Gauge Type,,false,,"selected(${types_of_devices_transducers}, 'force_gauge')",,
+text,force_gauge_calibration,Force Gauge Calibration,,false,,"selected(${types_of_devices_transducers}, 'force_gauge')",,
+text,pressure_transducer_type,Pressure Transducer Type,,false,,"selected(${types_of_devices_transducers}, 'pressure')",,
+text,pressure_transducer_calibratio,Pressure Transducer Calibration,,false,,"selected(${types_of_devices_transducers}, 'pressure')",,
+text,other_transducer_type,Other Transducer Type,,false,,"selected(${types_of_devices_transducers}, 'other')",,
+text,other_transducer_calibration,Other Transducer Calibration,,false,,"selected(${types_of_devices_transducers}, 'other')",,
+end_group,,,,,,,,
+select_one mu7bg28,jacket_type,Jacket Type,,false,,,,
+text,other_jacket_type,"If Other, Describe",,false,,${jacket_type} = 'other',,
+select_multiple nu2up86,jacket_material,Jacket Material,,false,,${jacket_type} != 'none',,
+decimal,jacket_thickness_mm,Jacket Thickness (mm),,false,,${jacket_type} != 'none',,
+text,other_jacket_material,"If Other, Describe",,false,,"selected(${jacket_material}, 'other')",,
+select_multiple hj1em57,second_jacket_material,Second Jacket Material,,false,,${jacket_type} = 'double',,
+decimal,second_jacket_thickness_mm,Second Jacket Thickness (mm),,false,,${jacket_type} = 'double',,
+text,other_second_jacket_material,"If Other, Describe",,false,,"selected(${second_jacket_material}, 'other')",,
+text,jacket_setup_description,Jacket Setup Description,,false,multiline,${jacket_type} != 'none',,
+note,experimental_conditions,Experimental Conditions,,false,,,,
+decimal,confining_pressure,Confining Pressure,,false,,,,
+select_one gx7ns27,confining_pressure_units,Confining Pressure Units,,false,minimal,,,
+text,other_confining_pressure_units,"If Other, Specify",,false,,${confining_pressure_units} = 'other',,
+decimal,pore_pressure,Pore Pressure,,false,,,,
+select_one ba9ne27,pore_pressure_units,Pore Pressure Units,,false,minimal,,,
+text,other_pore_pressure_units,"If Other, Specify",,false,,${pore_pressure_units} = 'other',,
+decimal,effective_pressure,Effective Pressure,,false,,,,
+select_one vb63e62,effective_pressure_units,Effective Pressure Units,,false,minimal,,,
+text,other_effective_pressure_units,"If Other, specify",,false,,${effective_pressure_units} = 'other',,
+integer,temperature,Temperature (degrees C),,false,,,,
+decimal,strain_rate,Strain Rate,,false,,,,
+decimal,differential_stress,Differential Stress,,false,,,,
+select_one sq7ei65,differential_stress_units,Differential Stress Units,,false,minimal,,,
+text,other_differential_stress_unit,"If Other, Specify",,false,,${differential_stress_units} = 'other',,
+text,other_experimental_conditions,Other Experimental Conditions,,false,multiline,,,
+select_one sj9gf54,type_of_experiment,Type of Experiment,,false,,,,
+text,other_experiment_type,Other Experiment Type,,false,,${type_of_experiment} = 'other',,
+select_one ev7qo75,experimental_geometry,Experimental Geometry,,false,horizontal-compact,,,
+text,other_experimental_geometry,Other Experimental Geometry,,false,,${experimental_geometry} = 'other',,
+text,sample_orientation_before,Sample Orientation-Before,Sample Orientation relative to experimental setup,false,,,,
+text,sample_orientation_after,Sample Orientation-After,,false,,,,
+text,other_experiment_notes,Other Experiment Notes,,false,multiline,,,
+calculate,__version__,,,,,,,'vKRCFycT69vVHvRMLVd8MM'