syncing with upstream

This commit is contained in:
Senad Uka
2018-01-15 13:31:00 +01:00
parent bc646b86c2
commit fe35b0aa91
24 changed files with 325 additions and 149 deletions

View File

@@ -81,17 +81,17 @@ class SessionManager(object):
building_height=form_data.get('building_height', 0),
building_width=form_data.get('building_width', 0),
building_length=form_data.get('building_length', 0),
parapet_height=form_data.get('building_parapet_height', 0),
parapet_height=form_data.get('parapet_height', form_data.get('building_parapet_height', 0)),
wind_speed=form_data.get('wind_speed', 0),
exposure_category=form_data.get('exposure_category', 'C'),
exposure_transition_distance=form_data.get('exposure_category_transition_distance', 0),
ballast_block_weight=form_data.get('ballast_block_weight', 0),
max_psf=form_data.get('max_system_pressure', 0),
ballast_block_weight=form_data.get('ballast_block_weight', form_data.get('ballast_weight', 0)),
max_psf=form_data.get('system_pressure', form_data.get('max_system_pressure', form_data.get('max_psf', 0))),
system_type=form_data.get('system_type', SystemType.dualTilt.value),
module_type=form_data.get('module_type', ModuleType.Cell96.value),
anchor_type=form_data.get('anchor_type', AnchorType.OMG_PowerGrip_Plus.value),
spectral_response=form_data.get('design_spectral_response', 1),
seismic_importance_factor=form_data.get('importance_factor', 1)
spectral_response=form_data.get('design_spectral_response', form_data.get('spectral_response_acceleration', form_data.get('spectral_response', 1))),
seismic_importance_factor=form_data.get('seismic_importance_factor', form_data.get('importance_factor', 1))
)
self.db_session.add(self.site)
self.db_session.commit()