diff --git a/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityController.php b/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityController.php index 55af4a6ab..a458a02b0 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityController.php +++ b/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityController.php @@ -1,14 +1,29 @@ getUser(); + $id = $usr->getId(); + $criteria = Criteria::create()->andWhere(Criteria::expr()->eq('agent', $id)); + + $query + ->addCriteria($criteria); + } + + } diff --git a/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php b/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php index 92478d787..af4baa6d3 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php +++ b/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php @@ -200,10 +200,4 @@ class AsideActivity implements TrackUpdateInterface, TrackCreationInterface return $this; } - - // public function __toString() - // { - // // dump($this->type->getTitle()); - // return $this->type->getTitle(); - // } } diff --git a/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php b/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php index 2dcce3baa..ae4238d9a 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php +++ b/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php @@ -34,6 +34,7 @@ final class AsideActivityFormType extends AbstractType public function buildForm(FormBuilderInterface $builder, array $options) { + dump($options); $timeChoices = []; foreach ($this->timeChoices as $e) { @@ -108,7 +109,6 @@ final class AsideActivityFormType extends AbstractType $seconds = $data->getTimezone()->getOffset($data); $data->setTimeZone($timezoneUTC); $data->add(new \DateInterval('PT'.$seconds.'S')); - dump($data); // test if the timestamp is in the choices. // If not, recreate the field with the new timestamp diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/_delete.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/_delete.html.twig index fdbccb838..6871420aa 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/_delete.html.twig +++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/_delete.html.twig @@ -1,37 +1,28 @@
- {% block crud_content_header %} -

{{ ('crud.'~crud_name~'.title_delete')|trans({ '%as_string%': 'Aside Activity' }) }}

- {% endblock crud_content_header %} + {% block crud_content_header %} +

{{ ('crud.'~crud_name~'.title_delete')|trans({ '%as_string%': 'Aside Activity' }) }}

+ {% endblock crud_content_header %} -

{{ ('crud.'~crud_name~'.confirm_message_delete')|trans({ '%as_string%': 'Aside Activity' }) }}

+

{{ ('crud.'~crud_name~'.confirm_message_delete')|trans({ '%as_string%': 'Aside Activity' }) }}

- {{ form_start(form) }} + {{ form_start(form) }} - + - {{ form_end(form) }} -
\ No newline at end of file + {{ form_end(form) }} + diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/list.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/list.html.twig index 4d2bb9110..8963d58f6 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/list.html.twig +++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/list.html.twig @@ -1,107 +1,106 @@ {% extends "@ChillMain/layout.html.twig" %} -{% block title %}{{ 'Aside activity list' |trans }}{% endblock title %} +{% block title %} + {{ 'Aside activity list' |trans }} +{% endblock title %} {% block content %} -
-

{{ 'My aside activities' |trans }}

+
+

{{ 'My aside activities' |trans }}

-{% if entities|length == 0 %} -

- {{ "There aren't any aside activities."|trans }} - -

-{% else %} + {% if entities|length == 0 %} +

+ {{ "There aren't any aside activities."|trans }} + +

+ {% else %} -
- {# Sort activities according to date in descending order #} - {% for entity in entities|sort ((a, b) => b.date <=> a.date) %} - {% set t = entity.type %} +
+ {# Sort activities according to date in descending order #} + {% for entity in entities|sort ((a, b) => b.date <=> a.date) %} + {% set t = entity.type %} - {# only load aside activities of current user. #} - {% if entity.agent == app.user %} +
+
+
-
-
-
+

+ {{ entity.type.title | localize_translatable_string }} +

-

- {{ entity.type.title | localize_translatable_string }} -

+ {% if entity.date %} +

{{ entity.date|format_date('long') }}

+ {% endif %} - {% if entity.date %} -

{{ entity.date|format_date('long') }}

- {% endif %} +
+

+ + {{ entity.duration|date('H:i') }} +

+
-
-

- - {{ entity.duration|date('H:i') }} -

-
+
+
+
    + {% if entity.createdBy %} +
  • + {{ 'Created by: '|trans }}{{ entity.createdBy.usernameCanonical }} +
    • + {% endif %} +
+
+
-
-
-
    - {% if entity.createdBy %} -
  • - {{ 'Created by: '|trans }}{{ entity.createdBy.usernameCanonical }} -
    • - {% endif %} -
-
-
+ {# {% + if entity.note is not empty + or entity.createdBy|length > 0 + %} +
+ {% if entity.note is not empty %} +
+ {{ entity.note|chill_markdown_to_html }} +
+ {% endif %} + +
+ {% endif %} #} +
+
    +
      + {#
    • + +
      • #} + {# TOOD + {% if is_granted('CHILL_ACTIVITY_UPDATE', activity) %} + #} +
    • +
      • + {# TOOD + {% endif %} + {% if is_granted('CHILL_ACTIVITY_DELETE', activity) %} + #} +
    • + +
      • + {# + {% endif %} + #} +
    +
+
+
- {# {% - if entity.note is not empty - or entity.createdBy|length > 0 - %} -
- {% if entity.note is not empty %} -
- {{ entity.note|chill_markdown_to_html }} -
- {% endif %} - -
- {% endif %} #} -
-
    -
      - {#
    • - -
      • #} - {# TOOD - {% if is_granted('CHILL_ACTIVITY_UPDATE', activity) %} - #} -
    • - -
      • - {# TOOD - {% endif %} - {% if is_granted('CHILL_ACTIVITY_DELETE', activity) %} - #} -
    • - -
      • - {# - {% endif %} - #} -
    -
-
-
- {% endif %} - {% endfor %} -
- -
-{% endif %} + {% endfor %} +
+ +
+ {% endif %} {% endblock %} diff --git a/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml b/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml index e364a0461..127268a1d 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml +++ b/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml @@ -1,9 +1,10 @@ #general Show the aside activity: Voir l'activité annexe Edit the aside activity: Modifier l'activité annexe +Remove aside activity: Supprimer l'activité annexe Aside activity: Activité annexe Duration time: Durée -durationTime: durée +durationTime: durée user_username: nom de l'utilisateur Remark: Commentaire No comments: Aucun commentaire @@ -25,7 +26,7 @@ Required: Obligatoire Persons: Personnes Users: Utilisateurs Emergency: Urgent -by: 'Par ' +by: "Par " location: Lieu # Crud @@ -75,8 +76,10 @@ My aside activities: Mes activités annexes Date: Date Created by: Creér par - #Aside activity delete Delete aside activity: Supprimer une activité annexe Are you sure you want to remove the aside activity concerning "%name%" ?: Êtes-vous sûr de vouloir supprimer une activité annexe qui concerne "%name%" ? -The activity has been successfully removed.: L'activité a été supprimée. \ No newline at end of file +The activity has been successfully removed.: L'activité a été supprimée. + +#Menu +Create an aside activity: "Creér une activité annexe"