change interface single task

CHANGELOG.md

@@ -41,6 +41,7 @@ and this project adheres to
 * [activity] activity admin: translations + remove label field for comment on admin activity type (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/587)
 * [main] admin user_job: improvements (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/588)
 * [address] can add extra address info even if noAddress (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/576)
+* [search] Change order of birthdate fields in advanced search
 
 
 ### 2022-05-06

src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss

@@ -42,6 +42,13 @@ body {
    footer {
       margin-top: auto;
    }
+   .content-title {
+      background-color: $chill-l-gray; 
+      border-radius:3px; 
+      padding:.5rem;
+      margin-bottom: 1rem;
+      box-shadow: rgba(0, 0, 0, 0.12) 0px 1px 3px, rgba(0, 0, 0, 0.24) 0px 1px 2px !important;
+   }
 }
 
 header {
@@ -214,6 +221,19 @@ footer.footer {
    }
 }
 
+/*
+*     PERSON INFO
+*/
+
+.chill_view_data, .pop-item {
+   .info-field {
+      border: 1px dashed; 
+      padding:.5rem; 
+      border-radius:3px; 
+      margin-top:.5rem;
+   }
+}
+
 /*
  *    ADMIN STYLES
  */
@@ -260,6 +280,8 @@ table.table-bordered {
    background-color: $gray-200;
    color: $gray-800;
    font-size: 90%;
+   box-shadow: rgba(0, 0, 0, 0.12) 0px 1px 3px, rgba(0, 0, 0, 0.24) 0px 1px 2px;
+   border-radius: 5px !important;
 
     p {
         margin-bottom: 0.75rem !important;
@@ -459,8 +481,19 @@ span.item-key {
 /// Workflows
 div.workflow {
     section.step {
-        border: 1px solid $chill-l-gray;
+      form {
-        padding: 1em 2em;
+         display: flex;
+         flex-direction: column;
+         align-items: center;
+      }
+      i.fa-angle-double-down {
+         font-size: 3rem;
+         color: rgba(0, 0, 0, 0.568);
+         margin-bottom: 1rem;
+         margin-top: 1rem;
+      }
+      //   border: 1px solid $chill-l-gray;
+      //   padding: 1em 2em;
         div.flex-table {
             margin: 1.5em -2em;
         }

src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss

@@ -6,6 +6,26 @@
 *  FLEX RESPONSIVE TABLE/BLOCK PRESENTATION
 */
 
+.pop-item {
+    border-radius: 10px !important;
+    box-shadow: rgba(0, 0, 0, 0.12) 0px 1px 3px, rgba(0, 0, 0, 0.24) 0px 1px 2px !important;
+    padding:1.7rem;
+    margin-top: .5rem;
+    margin-bottom: .5rem;
+    .subtitle {
+        background-color: $chill-ll-gray; 
+        border-radius:3px; 
+        padding:.5rem;
+        margin-top: 1rem;
+    }
+    &:last-child {
+        margin-bottom: 1rem;
+    }
+    &:first-child {
+        margin-top:1rem;
+    }
+}
+
 div.flex-bloc,
 div.flex-table {
     display: flex;
@@ -14,11 +34,39 @@ div.flex-table {
     box-sizing: border-box;
     margin: 1.5em 0;
 
+    div.message-item {
+        border-radius: 10px !important;
+        box-shadow: rgba(9, 30, 66, 0.25) 0px 1px 1px, rgba(9, 30, 66, 0.13) 0px 0px 1px 1px !important;
+        width: 96%;
+        margin-bottom: .5rem;
+        margin-left: auto;
+        margin-right: auto;
+    }
+
+    div.card-item {
+        border-radius: 10px !important;
+        box-shadow: rgba(0, 0, 0, 0.4) 0px 2px 4px, rgba(0, 0, 0, 0.3) 0px 7px 13px -3px, rgba(0, 0, 0, 0.2) 0px -3px 0px inset !important;
+        width: 96%;
+        margin-left: auto;
+        margin-right: auto;
+    }
+
     div.item-bloc {
         display: flex;
         @include border-collapse;
         padding: 1em;
-
+        border-radius: 5px !important;
+        box-shadow: rgba(0, 0, 0, 0.12) 0px 1px 3px, rgba(0, 0, 0, 0.24) 0px 1px 2px, rgba(0, 0, 0, 0.24) 0px 1px 2px !important;
+        margin-left: auto;
+        margin-right: auto;
+        margin-top: .5rem;
+        width: 97%;
+        &:last-child {
+            margin-bottom: 1rem;
+        }
+        &:first-child {
+            margin-top:1rem;
+        }
         div.item-row {
             display: flex;
 

src/Bundle/ChillMainBundle/Resources/public/chill/scss/notification.scss

@@ -48,19 +48,40 @@ div.notification-show {
                     }
                 }
                 ul.small_in_title {
-                    list-style-type: circle;
+                    // list-style-type: circle;
                     li {
+                        list-style: none;
+                        margin-bottom: 1rem;
                         span.item-key {
                             display: inline-block;
+                            background-color: white;
                             width: 3em;
+                            font-size: 1.2rem;
                         }
                     }
                 }
             }
             div.notification-content {
-                margin: 1.5rem;
+                width: 93%;
-                p {
+                margin: 1.5rem auto 1.5rem auto;
-                    margin-bottom: 0.75rem;
+                .message {
+                    background-color: #f3f3f3;
+                    line-height: 1.75;
+                    box-shadow: rgba(0, 0, 0, 0.25) 0px 0.0625em 0.0625em, rgba(0, 0, 0, 0.25) 0px 0.125em 0.5em, rgba(255, 255, 255, 0.1) 0px 0px 0px 1px inset;
+                    padding: 1.5rem;
+                    border-radius: 5px;
+                    border-left: $chill-yellow 10px solid;
+                    p:first-child {
+                        margin-bottom: 1rem;
+                        &::before {
+                            content: "“";
+                            font-family: Georgia;
+                            font-size: 40px;
+                            line-height: 0;
+                            display: inline-block;
+                            display: -webkit-inline-box;
+                        }
+                    }
                 }
             }
         }

src/Bundle/ChillMainBundle/Resources/views/Notification/_list_item.html.twig

@@ -67,14 +67,16 @@
         <div class="notification-content">
             {% if c.full_content is defined and c.full_content == true %}
                 {% if c.notification.message is not empty %}
-                    {{ c.notification.message|chill_markdown_to_html }}
+                    <div class="message">{{ c.notification.message|chill_markdown_to_html }}</div>
                 {% else %}
                     <p class="chill-no-data-statement">{{ 'Any comment'|trans }}</p>
                 {% endif %}
             {% else %}
                 {% if c.notification.message is not empty %}
+                    <div class="message">
                         {{ c.notification.message|u.truncate(250, '…', false)|chill_markdown_to_html }}
                         <p class="read-more"><a href="{{ chill_path_add_return_path('chill_main_notification_show', {'id': c.notification.id}) }}">{{ 'Read more'|trans }}</a></p>
+                    </div>
                 {% else %}
                     <p class="chill-no-data-statement">{{ 'Any comment'|trans }}</p>
                 {% endif %}

src/Bundle/ChillMainBundle/Resources/views/Workflow/_decision.html.twig

@@ -9,7 +9,7 @@
     {% set labels = workflow_metadata(entity_workflow, 'label', step.currentStep) %}
     {% set label = labels is null ? step.currentStep : labels|localize_translatable_string %}
 
-    <div class="card">
+    <div class="pop-item">
         <div class="card-body">
             <div class="row">
                 <div class="col-sm-12">
@@ -47,7 +47,8 @@
             {% endif %}
         </div>
     </div>
-
+    <i class="fa fa-angle-double-down" aria-hidden="true"></i>
+    <div class="pop-item">
         <div id="transitionFilter">
             {% if transition_form.transitionFilter is defined %}
                 {{ form_row(transition_form.transitionFilter) }}
@@ -79,6 +80,7 @@
         </ul>
 
         {{ form_end(transition_form) }}
+    </div>
 {% else %}
     <div class="alert alert-chill-yellow">
 

src/Bundle/ChillMainBundle/Resources/views/Workflow/_history.html.twig

@@ -5,7 +5,7 @@
         {% set place_labels = workflow_metadata(entity_workflow, 'label', step.currentStep) %}
         {% set place_label = place_labels is null ? step.currentStep : place_labels|localize_translatable_string %}
 
-        <div class="item-bloc {{ 'bloc' ~ step.id }} {% if loop.first %}initial{% endif %}">
+        <div class="item-bloc message-item {{ 'bloc' ~ step.id }} {% if loop.first %}initial{% endif %}">
             <div class="item-row">
 
                 {% if loop.first and step.next is null %}

src/Bundle/ChillMainBundle/Resources/views/Workflow/index.html.twig

@@ -32,15 +32,20 @@
         - src/Bundle/ChillPersonBundle/Resources/views/Workflow/_accompanying_period_work.html.twig
         - src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/_workflow.html.twig
     #}
-    <section class="step my-4">
+    <section class="step my-4 pop-item">
-        <div class="mb-5">
+        <div class="mb-3">
             <h2>{{ handler.entityTitle(entity_workflow) }}</h2>
 
             {{ macro.breadcrumb({'entity_workflow': entity_workflow}) }}
         </div>
 
         {% include handler_template with handler_template_data|merge({'display_action': true }) %}
+    </section>
 
+    <section class="step my-4">{% include '@ChillMain/Workflow/_decision.html.twig' %}</section>
+    <section class="step my-4 pop-item">{% include '@ChillMain/Workflow/_follow.html.twig' %}</section>
+    {#<section class="step my-4">{% include '@ChillMain/Workflow/_comment.html.twig' %}</section> #}
+    <section class="step my-4 pop-item">{% include '@ChillMain/Workflow/_history.html.twig' %}</section>
     {% if is_granted('CHILL_MAIN_WORKFLOW_DELETE', entity_workflow) %}
         <ul class="record_actions">
             <li>
@@ -52,13 +57,6 @@
             </li>
         </ul>
     {% endif %}
-    </section>
-
-    <section class="step my-4">{% include '@ChillMain/Workflow/_follow.html.twig' %}</section>
-    <section class="step my-4">{% include '@ChillMain/Workflow/_decision.html.twig' %}</section>{#
-    <section class="step my-4">{% include '@ChillMain/Workflow/_comment.html.twig' %}</section> #}
-    <section class="step my-4">{% include '@ChillMain/Workflow/_history.html.twig' %}</section>
-
     {# useful ?
     <ul class="record_actions sticky-form-buttons">
         <li class="cancel">

src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss

@@ -226,16 +226,35 @@ div.banner {
 div.household-resume {
     display: flex;
     flex-direction: row;
-    align-items: center;
+    align-items: flex-start;
+    justify-content: space-between;
+    padding-left: 1rem;
+    padding-right:1rem;
 
     div.col-address {
         font-size: 120%;
-        padding-left: 1em;
+        padding: 1rem;
-
+        border-radius: 5px;
+        border: 1px dotted tint-color($chill-accourse-context, 10%);
+        border-left: 1px dotted tint-color($chill-accourse-context, 10%);
+        border-right: 1px dotted tint-color($chill-accourse-context, 10%);
+        div.address-box {
+            width: 100%;
+            justify-content: flex-start;
+            align-items: flex-start;
+            display: flex;
+            i {
+                font-size: 200%;
+                margin-right: 2rem;
+                margin-top: 2rem;
+                margin-left: 1rem;
+            }
+        }
     }
     div.col-comment {
         //padding: 0;
         margin-bottom: 1rem;
+        width: 50%;
         display: flex;
         flex-direction: column;
         > * > * {

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig

@@ -1,5 +1,4 @@
-<div class="item-bloc accompanying_course_work-item{% if itemBlocClass is defined %} {{ itemBlocClass }}{% endif %}">
+<div class="item-bloc card-item accompanying_course_work-item{% if itemBlocClass is defined %} {{ itemBlocClass }}{% endif %}">
-
     <div class="item-row">
         <h2 class="badge-title">
             <span class="title_label"></span>
@@ -145,5 +144,4 @@
         </ul>
         {% endif %}
     </div>
-
 </div>

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list_item.html.twig

@@ -1,4 +1,4 @@
-<div class="item-bloc accompanying-period-item{% if itemBlocClass is defined %} {{ itemBlocClass|raw }}{% endif %}" data-accompanying-period-id="{{ period.id|e('html_attr') }}">
+<div class="item-bloc card-item accompanying-period-item{% if itemBlocClass is defined %} {{ itemBlocClass|raw }}{% endif %}" data-accompanying-period-id="{{ period.id|e('html_attr') }}">
     <div class="item-row">
         <div class="wrap-header">
             <div class="wh-row">

src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig

@@ -19,12 +19,14 @@
     <div class="row household-resume">
         <div class="item-bloc col-5 col-address">
             <h2>{{ 'Address'|trans }}</h2>
-
+            <div class="address-box">
+                <i class="fa fa-map-marker" aria-hidden="true"></i>
                 {% if address is empty %}
                     <p class="chill-no-data-statement">{{ 'household.Household does not have any address currently'|trans }}</p>
                 {% else %}
                     {{ address|chill_entity_render_box({'multiline': true, 'extended_infos': true }) }}
                 {% endif %}
+            </div>
 
             <ul class="list-inline text-right mt-2">
                 <li class="list-inline-item">
@@ -49,7 +51,7 @@
                 </li>
             </ul>
         </div>
-            <div class="item-bloc col-7 col-comment">
+        <div class="item-bloc col-7 col-comment pop-item">
             {% if form is null %}
                 {% set currentComposition = household.currentComposition %}
                 {% if currentComposition is not null %}
@@ -153,7 +155,7 @@
         {% endif %}
 
         {% if not (p == '_none' and members|length == 0 and old_members|length == 0) %}
-            <div class="mb-5">
+            <div class="mb-5 pop-item">
                 {% if p != '_none' %}
                   <h3>{{ p.label|localize_translatable_string }}
                       {% if false == p.shareHousehold %}

src/Bundle/ChillPersonBundle/Search/PersonSearch.php

@@ -94,6 +94,10 @@ class PersonSearch extends AbstractSearch implements HasAdvancedSearchFormInterf
                 'label' => 'Birthdate before',
                 'required' => false,
             ])
+            ->add('birthdate-after', ChillDateType::class, [
+                'label' => 'Birthdate after',
+                'required' => false,
+            ])
             ->add('phonenumber', TelType::class, [
                 'required' => false,
                 'label' => 'Part of the phonenumber',

src/Bundle/ChillTaskBundle/Resources/public/chill/scss/_task-statuses.scss

@@ -7,15 +7,12 @@
     &.place-new {
         background-color: $chill-yellow;
     }
-
     &.place-in_progress {
         background-color: $chill-green;
     }
-
     &.place-closed {
         background-color: $chill-blue;
     }
-
     &.place-canceled {
         background-color: $chill-beige;
     }

src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_show.html.twig

@@ -1,15 +1,15 @@
 <div class="task-show">
 
-	<h1>{{ 'Task'|trans }}</h1>
+	{# <h1 class="content-title">{{ 'Task'|trans }}</h1> #}
 
-	<h2>{{ task.title }}
+	<h2 style="margin-bottom: 1rem;">{{ task.title }}
 		{% for place in workflow_marked_places(task) %}
-			<span class="task-status box type-{{ task.type }} place-{{ place }}">{{ place|trans }}</span>
+			<span class="task-status badge rounded-pill box type-{{ task.type }} place-{{ place }}">{{ place|trans }}</span>
 		{% endfor %}
 	</h2>
 
+	<div class="pop-item">
 		<dl class="chill_view_data">
-
 			<dt class="inline">{{ 'Description'|trans }}</dt>
 			<dd>
 				{% if task.description is empty %}
@@ -20,52 +20,49 @@
 					</blockquote>
 				{% endif %}
 			</dd>
-
 			<dt class="inline">{{ 'Assignee'|trans }}</dt>
-		<dd>
+			<dd class="info-field">
 				{% if task.assignee is null %}
 					<span class="chill-no-data-statement">{{"No one assignee"|trans}}</span>
 				{% else %}
 					{{ task.assignee }}
 				{% endif %}
 			</dd>
-
 			{% if task.scope is not null %}
 				<dt class="inline">{{ 'Scope'|trans }}</dt>
-			<dd>
+				<dd class="info-field">
 					<span class="scope">{{ task.scope.name|localize_translatable_string }}</span>
 				</dd>
 			{% endif %}
-
+			<h3 class="subtitle">{{"Dates"|trans}}</h3>
-		<h3>{{"Dates"|trans}}</h3>
 			{% if task.startDate is null and task.endDate is null and task.warningDate is null %}
 				<dt></dt>
-			<dd>
+				<dd class="info-field">
 					<span class="chill-no-data-statement">{{"No dates specified"|trans}}</span>
 				</dd>
 			</dt>
 		{% else %}
 			{% if task.startDate is not null %}
 				<dt class="inline">{{ 'Start'|trans }}</dt>
-			<dd>{{ task.startDate|format_date('long') }}</dd>
+				<dd class="info-field">{{ task.startDate|format_date('long') }}</dd>
 			{% endif %}
-
 			{% if task.endDate is not null %}
 				<dt class="inline">{{ 'End'|trans }}</dt>
-			<dd>{{ task.endDate|format_date('long') }}</dd>
+				<dd class="info-field">{{ task.endDate|format_date('long') }}</dd>
 			{% endif %}
-
 			{% if task.warningDate is not null %}
 				<dt class="inline">{{ 'Warning'|trans }}</dt>
-			<dd>{{ task.warningDate|format_date('long') }}</dd>
+				<dd class="info-field">{{ task.warningDate|format_date('long') }}</dd>
 			{% endif %}
-
 		{% endif %}
-</dl>
+		</dl>
+	</div>
 
 {% if timeline is not null %}
-	<h3>{{"Timeline"|trans}}</h3>
+	<div class="pop-item">
+		<h3 class="subtitle">{{"Timeline"|trans}}</h3>
 		{{ timeline|raw }}
+	</div>
 {% endif %}
 
 <ul class="record_actions sticky-form-buttons">