Skip to content
This repository has been archived by the owner on Nov 12, 2021. It is now read-only.

Commit

Permalink
tiles organization
Browse files Browse the repository at this point in the history
  • Loading branch information
Romain committed May 20, 2018
1 parent 6cade30 commit eab26e0
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 21 deletions.
4 changes: 4 additions & 0 deletions ressources/css/consultation.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,7 @@
width: calc(100% - 60px);
height: 28px;
}

.patient_consultation{
min-width: 320px;
}
2 changes: 1 addition & 1 deletion ressources/css/consultation.min.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 12 additions & 12 deletions ressources/templates/patientAdministration.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,21 @@
<div style="display:flex;">
<?php include UtilPath::getViewsPath( 'patient_record' ); ?>

<?php if( Dinet::$setting->getSetting( SettingsEnum::GOAL, SettingsEnum::ACTIVATE ) ): ?>
<?php $goalUI->displayGoals( $_GET['patient_id'] ); ?>
<?php endif; ?>
<div style="display:flex;flex-wrap: wrap;">
<?php if( Dinet::$setting->getSetting( SettingsEnum::GOAL, SettingsEnum::ACTIVATE ) ): ?>
<?php $goalUI->displayGoals( $_GET['patient_id'] ); ?>
<?php endif; ?>

<?php if( Dinet::$setting->getSetting( SettingsEnum::CONSULTATION, SettingsEnum::ACTIVATE ) ): ?>
<?php include UtilPath::getViewsPath( 'consultation/patient_consultation' ); ?>
<?php endif; ?>
<?php if( Dinet::$setting->getSetting( SettingsEnum::CONSULTATION, SettingsEnum::ACTIVATE ) ): ?>
<?php include UtilPath::getViewsPath( 'consultation/patient_consultation' ); ?>
<?php endif; ?>
<?php $Chart->display(); ?>
<?php if( \Dinet\Dinet::$setting->getSetting( SettingsEnum::MONITORING, SettingsEnum::ACTIVATE ) ): ?>
<?php include UtilPath::getViewsPath( 'monitoring/lastFood' ); ?>
<?php endif; ?>
</div>
</div>

<div style="display:flex;">
<?php $Chart->display(); ?>
<?php if( \Dinet\Dinet::$setting->getSetting( SettingsEnum::MONITORING, SettingsEnum::ACTIVATE ) ): ?>
<?php include UtilPath::getViewsPath( 'monitoring/lastFood' ); ?>
<?php endif; ?>
</div>
</main>

<?php include UtilPath::getViewsPath('toast' ) ?>
2 changes: 1 addition & 1 deletion ressources/views/patient_record.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<input id="phone" type="text" name="Phone" value="<?= $PatientCtrl->getPatient()->getPhone() ?>">
</div>
<div class="patient_record_form_group" style="display: flex;">
<label for="obs">Observations :</label>
<label for="obs">Observations :</label>&nbsp;
<textarea id="obs" form="patient_form" name="Observation"><?= $PatientCtrl->getPatient()->getObservation() ?></textarea>
</div>
<input type="button" id="patientFormSubmit" class="button button-primary" value="Enregistrer">
Expand Down
8 changes: 2 additions & 6 deletions style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,7 @@ body.toplevel_page_dinet_plugin section header h2 {
}

.patient_record{
margin-bottom: 1rem;
width: 550px;
min-width: 510px;
}

.patient_record_form_group label{
Expand All @@ -225,11 +224,8 @@ body.toplevel_page_dinet_plugin section header h2 {

.patient_consultation{
margin-bottom: 1rem;
flex: 2;
}

.goal{
flex: 1;
flex-basis: calc(100% - 430px);
}

.goal input[type="text"]{
Expand Down
2 changes: 1 addition & 1 deletion style.min.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit eab26e0

Please sign in to comment.