mirror of
				https://gitlab.com/Chill-Projet/chill-bundles.git
				synced 2025-10-31 01:08:26 +00:00 
			
		
		
		
	AccompanyingPeriod list: adding new wrapheader asset and improve wraplist structure
wrapheader manage header of flex-table first row. the 2 cascades are independant.
This commit is contained in:
		| @@ -203,3 +203,36 @@ div.wraplist { | ||||
|         } | ||||
|     } | ||||
| } | ||||
|  | ||||
|  | ||||
| /* | ||||
| *  __WRAP_HEADER_BLOC________ | ||||
| *  HEADER ROW FOR FLEX-TABLE ELEMENTS | ||||
| */ | ||||
|  | ||||
| div.wrapheader { | ||||
|     width: 100%; | ||||
|  | ||||
|     div.wh-row { | ||||
|         display: flex; | ||||
|         flex-direction: row; | ||||
|  | ||||
|         &:first-child { | ||||
|             align-items: baseline; | ||||
|         } | ||||
|         &:last-child {} | ||||
|  | ||||
|         div.wh-col { | ||||
|             &:first-child { | ||||
|                 flex-grow: 0; flex-shrink: 1; flex-basis: auto; | ||||
|             } | ||||
|             &:last-child { | ||||
|                 flex-grow: 1; flex-shrink: 1; flex-basis: auto; | ||||
|  | ||||
|                 display: flex; | ||||
|                 justify-content: flex-end; | ||||
|             } | ||||
|         } | ||||
|  | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -2,102 +2,95 @@ | ||||
|     <div class="flex-table"> | ||||
|         {% for accompanying_period in accompanying_periods %} | ||||
|             <div class="item-bloc"> | ||||
|  | ||||
|                 <div class="item-row"> | ||||
|                     <div class="item-col"> | ||||
|                         <span class="h3"> | ||||
|                             <i class="fa fa-fw fa-random"></i> | ||||
|                             <b>{{ accompanying_period.id }}</b> | ||||
|                         </span> | ||||
|                         {% if accompanying_period.emergency %} | ||||
|                             <span class="badge bg-danger">{{- 'Emergency'|trans|upper -}}</span> | ||||
|                         {% endif %} | ||||
|                         {% if accompanying_period.confidential %} | ||||
|                             <span class="badge bg-danger">{{- 'Confidential'|trans|upper -}}</span> | ||||
|                         {% endif %} | ||||
|                     </div> | ||||
|                     <div class="item-col"> | ||||
|                         {% if accompanying_period.step == 'DRAFT' %} | ||||
|                             <span class="badge bg-secondary">{{- 'Draft'|trans|upper -}}</span> | ||||
|                         {% else %} | ||||
|                             <span class="badge bg-success">{{- 'Confirmed'|trans|upper -}}</span> | ||||
|                         {% endif %} | ||||
|                     </div> | ||||
|                 </div> | ||||
|                 <div class="item-row"> | ||||
|                     <div class="item-col"> | ||||
|                         {% if accompanying_period.closingDate == null %} | ||||
|                             {{ 'accompanying_period.dates_from_%opening_date%'|trans({ '%opening_date%': accompanying_period.openingDate|format_date('long') } ) }} | ||||
|                         {% else %} | ||||
|                             {{ 'accompanying_period.dates_from_%opening_date%_to_%closing_date%'|trans({ | ||||
|                                 '%opening_date%': accompanying_period.openingDate|format_date('long'), | ||||
|                                 '%closing_date%': accompanying_period.closingDate|format_date('long')} | ||||
|                             ) }} | ||||
|                             {% if accompanying_period.isOpen == false %} | ||||
|                                 <dl class="chill_view_data"> | ||||
|                                     <dt>{{ 'Closing motive'|trans }} :</dt> | ||||
|                                     <dd>{{ accompanying_period.closingMotive|chill_entity_render_box }}</dd> | ||||
|                                 </dl> | ||||
|                             {% endif %} | ||||
|                         {% endif %} | ||||
|                     </div> | ||||
|                     <div class="item-col"> | ||||
|                         {% if chill_accompanying_periods.fields.user == 'visible'  %} | ||||
|                             {% if accompanying_period.user %} | ||||
|                                 {{ accompanying_period.user.username }} | ||||
|                             {% else %} | ||||
|                                 <span class="chill-no-data-statement">{{ 'No accompanying user'|trans }}</span> | ||||
|                             {% endif %} | ||||
|                         {% endif %} | ||||
|                     </div> | ||||
|                 </div> | ||||
|  | ||||
|                 <div class="item-row separator"> | ||||
|                     <div class="wraplist"> | ||||
|                         <div class="wl-row"> | ||||
|                             <div class="wl-col title"><h3>{{ 'Participants'|trans }}</h3></div> | ||||
|                             <div class="wl-col list"> | ||||
|                                 {% if accompanying_period.participations.count > 0 %} | ||||
|                                     {% for p in accompanying_period.participations %} | ||||
|                                     <p class="wl-item"> | ||||
|                                         <a href="{{ path('chill_person_accompanying_period_list', { person_id: p.person.id }) }}"> | ||||
|                                             {{ p.person.firstname ~ ' ' ~ p.person.lastname }} | ||||
|                                         </a> | ||||
|                                     </p> | ||||
|                                     {% endfor %} | ||||
|                     <div class="wrapheader"> | ||||
|                         <div class="wh-row"> | ||||
|                             <div class="wh-col"> | ||||
|                                 <span class="h3"> | ||||
|                                     <i class="fa fa-fw fa-random"></i> | ||||
|                                     <b>{{ accompanying_period.id }}</b> | ||||
|                                 </span> | ||||
|                                 {% if accompanying_period.emergency %} | ||||
|                                     <span class="badge bg-danger">{{- 'Emergency'|trans|upper -}}</span> | ||||
|                                 {% endif %} | ||||
|                                 {% if accompanying_period.confidential %} | ||||
|                                     <span class="badge bg-danger">{{- 'Confidential'|trans|upper -}}</span> | ||||
|                                 {% endif %} | ||||
|                             </div> | ||||
|                             <div class="wh-col"> | ||||
|                                 {% if accompanying_period.step == 'DRAFT' %} | ||||
|                                     <span class="badge bg-secondary">{{- 'Draft'|trans|upper -}}</span> | ||||
|                                 {% else %} | ||||
|                                     <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span> | ||||
|                                     <span class="badge bg-success">{{- 'Confirmed'|trans|upper -}}</span> | ||||
|                                 {% endif %} | ||||
|                             </div> | ||||
|                         </div> | ||||
|                         <div class="wh-row"> | ||||
|                             <div class="wh-col"> | ||||
|                                 {% if accompanying_period.closingDate == null %} | ||||
|                                     {{ 'accompanying_period.dates_from_%opening_date%'|trans({ '%opening_date%': accompanying_period.openingDate|format_date('long') } ) }} | ||||
|                                 {% else %} | ||||
|                                     {{ 'accompanying_period.dates_from_%opening_date%_to_%closing_date%'|trans({ | ||||
|                                         '%opening_date%': accompanying_period.openingDate|format_date('long'), | ||||
|                                         '%closing_date%': accompanying_period.closingDate|format_date('long')} | ||||
|                                     ) }} | ||||
|                                     {% if accompanying_period.isOpen == false %} | ||||
|                                         <dl class="chill_view_data"> | ||||
|                                             <dt>{{ 'Closing motive'|trans }} :</dt> | ||||
|                                             <dd>{{ accompanying_period.closingMotive|chill_entity_render_box }}</dd> | ||||
|                                         </dl> | ||||
|                                     {% endif %} | ||||
|                                 {% endif %} | ||||
|                             </div> | ||||
|                             <div class="wh-col"> | ||||
|                                 {% if chill_accompanying_periods.fields.user == 'visible'  %} | ||||
|                                     {% if accompanying_period.user %} | ||||
|                                         {{ accompanying_period.user.username }} | ||||
|                                     {% else %} | ||||
|                                         <span class="chill-no-data-statement">{{ 'No accompanying user'|trans }}</span> | ||||
|                                     {% endif %} | ||||
|                                 {% endif %} | ||||
|                             </div> | ||||
|                         </div> | ||||
|                     </div> | ||||
|                 </div> | ||||
|  | ||||
|                 {% if accompanying_period.requestorPerson is not null or accompanying_period.requestorThirdParty is not null %} | ||||
|                 <div class="item-row"> | ||||
|                 </div> | ||||
|                 <div class="item-row separator"> | ||||
|  | ||||
|                     <div class="wraplist"> | ||||
|                         <div class="wl-row"> | ||||
|                             <div class="wl-col title"><h3>{{ 'Requestor'|trans }}</h3></div> | ||||
|                             <div class="wl-col list"> | ||||
|                                 {% if accompanying_period.requestorPerson is not null %} | ||||
|                                     <p class="wl-item"> | ||||
|                                         {{ accompanying_period.requestorPerson.firstname ~ ' ' ~ accompanying_period.requestorPerson.lastname }} | ||||
|                                     </p> | ||||
|                                 {% endif %} | ||||
|                                 {% if accompanying_period.requestorThirdParty is not null %} | ||||
|                                     <p class="wl-item"> | ||||
|                                         {{ accompanying_period.requestorThirdParty.name }} | ||||
|                                     </p> | ||||
|                                 {% endif %} | ||||
|                         {% if accompanying_period.participations.count > 0 %} | ||||
|                             <div class="wl-row"> | ||||
|                                 <div class="wl-col title"><h3>{{ 'Participants'|trans }}</h3></div> | ||||
|                                 <div class="wl-col list"> | ||||
|                                     {% for p in accompanying_period.participations %} | ||||
|                                         <p class="wl-item"> | ||||
|                                             <a href="{{ path('chill_person_accompanying_period_list', { person_id: p.person.id }) }}"> | ||||
|                                                 {{ p.person.firstname ~ ' ' ~ p.person.lastname }} | ||||
|                                             </a> | ||||
|                                         </p> | ||||
|                                     {% endfor %} | ||||
|                                 </div> | ||||
|                             </div> | ||||
|                         </div> | ||||
|                     </div> | ||||
|                 </div> | ||||
|                 {% endif %} | ||||
|  | ||||
|                 {% if accompanying_period.socialIssues.count > 0 %} | ||||
|                     <div class="item-row"> | ||||
|                         <div class="wraplist"> | ||||
|                         {% endif %} | ||||
|                         {% if accompanying_period.requestorPerson is not null or accompanying_period.requestorThirdParty is not null %} | ||||
|                             <div class="wl-row"> | ||||
|                                 <div class="wl-col title"><h3>{{ 'Requestor'|trans }}</h3></div> | ||||
|                                 <div class="wl-col list"> | ||||
|                                     {% if accompanying_period.requestorPerson is not null %} | ||||
|                                         <p class="wl-item"> | ||||
|                                             {{ accompanying_period.requestorPerson.firstname ~ ' ' ~ accompanying_period.requestorPerson.lastname }} | ||||
|                                         </p> | ||||
|                                     {% endif %} | ||||
|                                     {% if accompanying_period.requestorThirdParty is not null %} | ||||
|                                         <p class="wl-item"> | ||||
|                                             {{ accompanying_period.requestorThirdParty.name }} | ||||
|                                         </p> | ||||
|                                     {% endif %} | ||||
|                                 </div> | ||||
|                             </div> | ||||
|                         {% endif %} | ||||
|                         {% if accompanying_period.socialIssues.count > 0 %} | ||||
|                             <div class="wl-row"> | ||||
|                                 <div class="wl-col title"><h3>{{ 'Social issues'|trans }}</h3></div> | ||||
|                                 <div class="wl-col list"> | ||||
| @@ -108,13 +101,13 @@ | ||||
|                                     {% endfor %} | ||||
|                                 </div> | ||||
|                             </div> | ||||
|                         </div> | ||||
|                         {% endif %} | ||||
|                     </div> | ||||
|                 {% endif %} | ||||
|  | ||||
|                 </div> | ||||
|                 <div class="item-row separator"> | ||||
|                     <ul class="record_actions"> | ||||
|  | ||||
|                     <ul class="record_actions"> | ||||
|                         {# TODO if enable_accompanying_course_with_multiple_persons is true ... #} | ||||
|                         <li> | ||||
|                             <a href="{{ path('chill_person_accompanying_course_index', { 'accompanying_period_id': accompanying_period.id }) }}" | ||||
| @@ -147,10 +140,9 @@ | ||||
|                         {% elseif household is defined %} | ||||
|                             {# TODO buttons specific for household ? #} | ||||
|                         {% endif %} | ||||
|  | ||||
|                     </ul> | ||||
|                 </div> | ||||
|  | ||||
|                 </div> | ||||
|             </div> | ||||
|         {% endfor %} | ||||
|     </div> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user