diff --git a/composer.json b/composer.json index 64d9dca22..f5f1a2806 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,8 @@ "Chill\\ReportBundle\\": "src/Bundle/ChillReportBundle", "Chill\\TaskBundle\\": "src/Bundle/ChillTaskBundle", "Chill\\ThirdPartyBundle\\": "src/Bundle/ChillThirdPartyBundle", - "Chill\\AsideActivityBundle\\": "src/Bundle/ChillAsideActivityBundle/src" + "Chill\\AsideActivityBundle\\": "src/Bundle/ChillAsideActivityBundle/src", + "Chill\\DocGeneratorBundle\\": "src/Bundle/ChillDocGeneratorBundle" } }, "autoload-dev": { @@ -90,4 +91,4 @@ "config": { "bin-dir": "bin" } -} \ No newline at end of file +} diff --git a/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss b/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss index 1d271abfe..fc492c7bc 100644 --- a/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss +++ b/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss @@ -1,14 +1,105 @@ // Access to Bootstrap variables and mixins @import '~ChillMainAssets/module/bootstrap/shared'; -//@import '~ChillMainSass/custom/mixins/entity'; +// activity creation first step: select type page +div.new-activity-select-type { + div.activity-row { + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: center; + gap: 12px; -//.chill-entity.chill-entity__activity-reason { -// @include entity($chill-pink, white); -//} + div.bloc { + width: 200px; + align-self: flex-end; + height: 140px; + display: flex; + justify-content: center; + align-items: center; + } + } +} -.activity { - //color: $chill-green; +// exceptions for flex-table in list-records +div.activity-list { + div.flex-table { + div.item-bloc { + div.item-row.main { + div.item-col { + &:first-child { + flex-basis: 27%; + } + ul.list-content { + li.social-issues, li.social-actions { + .badge-primary { + font-variant: small-caps; + font-weight: bold; + font-size: 88%; + margin-bottom: 0.2em; + } + } + li.social-issues .badge-primary { + background-color: $orange; + } + li.social-actions .badge-primary { + background-color: $green; + } + } + } + } + div.item-row.details { + flex-direction: row; + & > div.item-col { + justify-content: flex-start; + align-self: center; + &:nth-child(1) { + flex-grow: 1; flex-shrink: 0; flex-basis: 30%; + } + &:nth-child(2) { + flex-grow: 0; flex-shrink: 1; flex-basis: 70%; + } + + &:only-child { + flex-grow: 0; flex-shrink: 0; flex-basis: 100%; + & > div.concerned-groups { + flex-grow: 0; flex-shrink: 0; flex-basis: 100%; + display: flex; + flex-direction: column; // TODO pas fini + div.group { + flex-grow: 1; flex-shrink: 0; flex-basis: 30%; + h4 {} + ul.list-content { + li { + display: inline; + } + } + } + } + } + } + div.concerned-groups { + font-size: 85%; + h4 { + text-transform: uppercase; + } + } + } + ul.list-content { + list-style-type: none; + padding-left: 1em; + margin: 0 0; + li { + margin-bottom: 0.2em; + } + } + } + div.duration { + font-size: smaller; + padding-left: 1em; + margin-top: 1em; + } + } } // exceptions for flex-bloc in concerned-groups @@ -22,7 +113,7 @@ div.flex-bloc.concerned-groups { li { margin-bottom: 0.2em; a { - color: white; + color: $white; cursor: pointer; &:hover { color: #ffffffab; @@ -36,97 +127,3 @@ div.flex-bloc.concerned-groups { } } -// exceptions for flex-table in list-records -div.flex-table.list-records { - div.item-bloc { - div.item-row.main { - div.item-col { - &:first-child { - flex-basis: 27%; - } - ul.list-content { - li.social-issues, li.social-actions { - .badge-primary { - font-variant: small-caps; - font-weight: bold; - font-size: 88%; - margin-bottom: 0.2em; - } - } - li.social-issues .badge-primary { - background-color: var(--chill-orange); - } - li.social-actions .badge-primary { - background-color: var(--chill-green); - } - } - } - } - div.item-row.details { - flex-direction: row; - & > div.item-col { - justify-content: flex-start; - align-self: center; - &:nth-child(1) { - flex-grow: 1; flex-shrink: 0; flex-basis: 30%; - } - &:nth-child(2) { - flex-grow: 0; flex-shrink: 1; flex-basis: 70%; - } - - &:only-child { - flex-grow: 0; flex-shrink: 0; flex-basis: 100%; - & > div.concerned-groups { - flex-grow: 0; flex-shrink: 0; flex-basis: 100%; - display: flex; - flex-direction: column; // TODO pas fini - div.group { - flex-grow: 1; flex-shrink: 0; flex-basis: 30%; - h4 {} - ul.list-content { - li { - display: inline; - } - } - } - } - } - } - div.concerned-groups { - font-size: 85%; - h4 { - text-transform: uppercase; - } - } - } - ul.list-content { - list-style-type: none; - padding-left: 1em; - margin: 0 0; - li { - margin-bottom: 0.2em; - } - } - } - div.duration { - font-size: smaller; - padding-left: 1em; - margin-top: 1em; - } -} - -div.activity-row { - display: flex; - flex-direction: row; - flex-wrap: wrap; - justify-content: center; - gap: 12px; - div.bloc { - width: 200px; - align-self: flex-end; - height: 140px; - display: flex; - justify-content: center; - align-items: center; - } -} diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig index 92b1b3ff4..2ee9eeba0 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig @@ -60,7 +60,10 @@
  • - {{ item|chill_entity_render_box({'render': 'raw'}) }} + {{ item|chill_entity_render_box({ + 'render': 'raw', + 'addAltNames': false + }) }}
  • @@ -72,7 +75,7 @@ {% endfor %} {% endif %} - + {% if (with_display == 'row') %}
    {% for bloc in blocs %} @@ -84,7 +87,10 @@
  • - {{ item|chill_entity_render_box({'only_denomination': true}) }} + {{ item|chill_entity_render_box({ + 'render': 'raw', + 'addAltNames': false + }) }}
  • diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig index f7c0d12b2..35d39f609 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig @@ -1,184 +1,163 @@ -{% set person_id = null %} -{% if person %} - {% set person_id = person.id %} -{% endif %} +
    -{% set accompanying_course_id = null %} -{% if accompanyingCourse %} - {% set accompanying_course_id = accompanyingCourse.id %} -{% endif %} + {% if activities|length == 0 %} +

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

    -

    {{ 'Activity list' |trans }}

    + {% else %} +
    + {% for activity in activities %} + {% set t = activity.type %} +
    +
    +
    -{% if activities|length == 0 %} -

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

    -{% else %} - -
    - - {% for activity in activities %} - {% set t = activity.type %} -
    -
    -
    - - {% if activity.date %} -

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

    - {% endif %} - -
    - {% if t.durationTimeVisible > 0 %} -

    - - {{ activity.durationTime|date('H:i') }} -

    - {% endif %} - {% if activity.travelTime and t.travelTimeVisible %} -

    - - {{ activity.travelTime|date('H:i') }} -

    - {% endif %} -
    - - {% if context == 'person' and activity.accompanyingPeriod is not empty %} - - {% endif %} - -
    -
    -
      - {% if activity.user and t.userVisible %} -
    • - {{ 'by'|trans }}{{ activity.user.usernameCanonical }} -
    • - {% endif %} - -
    • - {{ activity.type.name | localize_translatable_string }} - - {% if activity.attendee is not null and t.attendeeVisible %} - {% if activity.attendee %} - {{ '→ ' ~ 'present'|trans|capitalize }} - {% else %} - {{ '→ ' ~ 'not present'|trans|capitalize }} - {% endif %} + {% if activity.date %} +

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

      {% endif %} -
    • -
    • - {{ 'location'|trans ~ ': ' }} - Domicile de l'usager - {# - {% if activity.location %}{{ activity.location }}{% endif %} - #} -
    • +
      + {% if t.durationTimeVisible > 0 %} +

      + + {{ activity.durationTime|date('H:i') }} +

      + {% endif %} + {% if activity.travelTime and t.travelTimeVisible %} +

      + + {{ activity.travelTime|date('H:i') }} +

      + {% endif %} +
      - {%- if t.reasonsVisible -%} -
    • - {%- if activity.reasons is empty -%} - {{ 'No reason associated'|trans }} - {%- else -%} - {% for r in activity.reasons %} - {{ r|chill_entity_render_box }} - {% endfor %} - {%- endif -%} -
    • - {% endif %} + {% if context == 'person' and activity.accompanyingPeriod is not empty %} + + {% endif %} - {%- if t.socialIssuesVisible %} - - {% endif %} +
    +
    +
      + {% if activity.user and t.userVisible %} +
    • + {{ 'by'|trans }}{{ activity.user.usernameCanonical }} +
    • + {% endif %} - {%- if t.socialActionsVisible -%} - - {% endif %} +
    • + {{ activity.type.name | localize_translatable_string }} + + {% if activity.attendee is not null and t.attendeeVisible %} + {% if activity.attendee %} + {{ '→ ' ~ 'present'|trans|capitalize }} + {% else %} + {{ '→ ' ~ 'not present'|trans|capitalize }} + {% endif %} + {% endif %} +
    • + +
    • + {{ 'location'|trans ~ ': ' }} + Domicile de l'usager + {# + {% if activity.location %}{{ activity.location }}{% endif %} + #} +
    • + + {%- if t.reasonsVisible -%} +
    • + {%- if activity.reasons is not empty -%} + {% for r in activity.reasons %} + {{ r|chill_entity_render_box }} + {% endfor %} + {%- endif -%} +
    • + {% endif %} + + {%- if t.socialIssuesVisible %} + + {% endif %} + + {%- if t.socialActionsVisible -%} + + {% endif %} -
    -
      -
    • - -
    • - {# TOOD +
    +
      +
    • + +
    • + {# TOOD {% if is_granted('CHILL_ACTIVITY_UPDATE', activity) %} - #} -
    • - -
    • - {# TOOD + #} +
    • + +
    • + {# TOOD {% endif %} {% if is_granted('CHILL_ACTIVITY_DELETE', activity) %} - #} -
    • - -
    • - {# - {% endif %} - #} -
    + #} +
  • + +
  • + {# + {% endif %} + #} + +
    +
    + + {% if activity.comment.comment is not empty + or activity.persons|length > 0 + or activity.thirdParties|length > 0 + or activity.users|length > 0 + %} +
    +
    + {% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {'context': context, 'with_display': 'row', 'entity': activity } %} +
    + + {% if activity.comment.comment is not empty %} +
    + {{ activity.comment|chill_entity_render_box({ + 'disable_markdown': false, + 'limit_lines': 3, + 'metadata': false, + }) }} +
    + {% endif %} +
    + {% endif %} +
    -
    - - {% - if activity.comment.comment is not empty - or activity.persons|length > 0 - or activity.thirdParties|length > 0 - or activity.users|length > 0 - %} -
    -
    - - {% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {'context': context, 'with_display': 'row', 'entity': activity } %} -
    - - {% if activity.comment.comment is not empty %} -
    - {{ activity.comment|chill_entity_render_box( { 'limit_lines': 3, 'metadata': false } ) }} -
    - {% endif %} -
    - {% endif %} - + {% endfor %}
    - {% endfor %} -
    -{% endif %} + {% endif %} -{% if context != 'person' %} -{# TODO set this condition in configuration #} - -{% endif %} +
    diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listAccompanyingCourse.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listAccompanyingCourse.html.twig index 53e7ec86e..a988debfd 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listAccompanyingCourse.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listAccompanyingCourse.html.twig @@ -5,5 +5,27 @@ {% block title %}{{ 'Activity list' |trans }}{% endblock title %} {% block content %} + + {% set person_id = null %} + {% if person %} + {% set person_id = person.id %} + {% endif %} + + {% set accompanying_course_id = null %} + {% if accompanyingCourse %} + {% set accompanying_course_id = accompanyingCourse.id %} + {% endif %} + +

    {{ 'Activity list' |trans }}

    + {% include 'ChillActivityBundle:Activity:list.html.twig' with {'context': 'accompanyingCourse'} %} + + + {% endblock %} diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig index 649821dc7..5a9f0125f 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig @@ -21,5 +21,27 @@ {% block title %}{{ 'Activity list' |trans }}{% endblock title %} {% block personcontent %} + + {% set person_id = null %} + {% if person %} + {% set person_id = person.id %} + {% endif %} + + {% set accompanying_course_id = null %} + {% if accompanyingCourse %} + {% set accompanying_course_id = accompanyingCourse.id %} + {% endif %} + +

    {{ 'Activity list' |trans }}

    + {% include 'ChillActivityBundle:Activity:list.html.twig' with {'context': 'person'} %} + + + {% endblock %} diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/selectType.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/selectType.html.twig index 484deb55a..996d95b0f 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/selectType.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/selectType.html.twig @@ -1,28 +1,30 @@ -

    {{ "Activity creation"|trans }}

    +
    +

    {{ "Activity creation"|trans }}

    -{# TODO: refaire l'html css des tuilles #} + {# TODO: refaire l'html css des tuilles #} -{% for row in data %} -

    {{ row.activityTypeCategory.name|localize_translatable_string }}

    -
    - {% for activityType in row.activityTypes %} + {% for row in data %} +

    {{ row.activityTypeCategory.name|localize_translatable_string }}

    +
    + {% for activityType in row.activityTypes %} - {% set person_id = null %} - {% if person %} - {% set person_id = person.id %} - {% endif %} + {% set person_id = null %} + {% if person %} + {% set person_id = person.id %} + {% endif %} - {% set accompanying_course_id = null %} - {% if accompanyingCourse %} - {% set accompanying_course_id = accompanyingCourse.id %} - {% endif %} + {% set accompanying_course_id = null %} + {% if accompanyingCourse %} + {% set accompanying_course_id = accompanyingCourse.id %} + {% endif %} - + -
    - {{ activityType.name|localize_translatable_string }} -
    -
    - {% endfor %} -
    -{% endfor %} +
    + {{ activityType.name|localize_translatable_string }} +
    + + {% endfor %} +
    + {% endfor %} +
    diff --git a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210804082249.php b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210804082249.php index 8a0e98b9a..4135bb4a2 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210804082249.php +++ b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210804082249.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Application\Migrations; +namespace Chill\Migrations\AsideActivity; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; diff --git a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210806140343.php b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210806140343.php index f05da8643..62b568407 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210806140343.php +++ b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210806140343.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Application\Migrations; +namespace Chill\Migrations\AsideActivity; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; diff --git a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210806140710.php b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210806140710.php index e71cd50d2..92320e639 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210806140710.php +++ b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210806140710.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Application\Migrations; +namespace Chill\Migrations\AsideActivity; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; diff --git a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210810084456.php b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210810084456.php index 51e9c0571..29d6be7f3 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210810084456.php +++ b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210810084456.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Application\Migrations; +namespace Chill\Migrations\AsideActivity; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; @@ -43,6 +43,6 @@ final class Version20210810084456 extends AbstractMigration $this->addSql('COMMENT ON COLUMN chill_asideactivity.AsideActivity.createdat IS \'(DC2Type:datetime_immutable)\''); $this->addSql('COMMENT ON COLUMN chill_asideactivity.AsideActivity.updatedat IS \'(DC2Type:datetime_immutable)\''); $this->addSql('COMMENT ON COLUMN chill_asideactivity.AsideActivity.date IS \'(DC2Type:datetime_immutable)\''); - + } } diff --git a/src/Bundle/ChillDocGeneratorBundle/.gitignore b/src/Bundle/ChillDocGeneratorBundle/.gitignore new file mode 100644 index 000000000..f443cb81e --- /dev/null +++ b/src/Bundle/ChillDocGeneratorBundle/.gitignore @@ -0,0 +1,11 @@ +composer.lock +vendor/* +parameters.yml +*~ +*.DS_Store +*.sass-cache +Resources/node_modules/ +Tests/Fixtures/App/app/config/parameters.yml +/nbproject/private/ +Resources/test/Fixtures/App/bootstrap.php.cache + diff --git a/src/Bundle/ChillDocGeneratorBundle/ChillDocGeneratorBundle.php b/src/Bundle/ChillDocGeneratorBundle/ChillDocGeneratorBundle.php new file mode 100644 index 000000000..350290b08 --- /dev/null +++ b/src/Bundle/ChillDocGeneratorBundle/ChillDocGeneratorBundle.php @@ -0,0 +1,9 @@ + $entity]; + } elseif(get_class($entity) == SocialAction::class) { + $ret = ['SocialAction' => $entity]; + } + + // TODO AJOUTER LES DONNES DU FORMULAIRE + + return $ret; + } +} diff --git a/src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php b/src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php new file mode 100644 index 000000000..0b870a34e --- /dev/null +++ b/src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php @@ -0,0 +1,9 @@ +setContent('Test'); + } + + /** + * @Route( + * "{_locale}/doc/gen/test", + * name="chill_docgenerator_test" + * ) + * + * @param Request $request + * @return \Symfony\Component\HttpFoundation\Response + */ + public function getDoc(Request $request, TempUrlOpenstackGenerator $tempUrlGenerator) + { + $p = $tempUrlGenerator->generate( + 'GET', + 'FORMULAIRE_AEB.docx', + $request->query->has('expires_delay') ? $request->query->getInt('expires_delay', 0) : null + ); + + $tmpfname = tempnam(sys_get_temp_dir(), 'DOC_TEMPLATE'); + file_put_contents($tmpfname, file_get_contents($p->{"url"})); + + $templateProcessor = new TemplateProcessor($tmpfname); + $templateProcessor->setValues(array('firstname' => 'John', 'lastname' => 'Doe')); + + $tmpfname2 = tempnam(sys_get_temp_dir(), 'DOC_GENERATED'); + $templateProcessor->saveAs($tmpfname2); + + unlink($tmpfname); + + $fileContent = fopen($tmpfname2, 'r'); // the generated file content + $response = new Response(fread($fileContent, filesize($tmpfname2))); + + $disposition = HeaderUtils::makeDisposition( + HeaderUtils::DISPOSITION_ATTACHMENT, + 'foo.docx' + ); + + $response->headers->set('Content-Disposition', $disposition); + unlink($tmpfname2); + + return $response; + } +} diff --git a/src/Bundle/ChillDocGeneratorBundle/DataFixtures/ORM/LoadDocGeneratorTemplate.php b/src/Bundle/ChillDocGeneratorBundle/DataFixtures/ORM/LoadDocGeneratorTemplate.php new file mode 100644 index 000000000..ade47e307 --- /dev/null +++ b/src/Bundle/ChillDocGeneratorBundle/DataFixtures/ORM/LoadDocGeneratorTemplate.php @@ -0,0 +1,55 @@ + ['fr' => 'FORMULAIRE AEB'], + 'desc' => 'stocké sur openstack comedienbe', + 'file' => 'FORMULAIRE_AEB.docx', + 'context' => 'Chill\DocGeneratorBundle\Context\HouseholdMemberSelectionContext', + 'entities' => ['Chill\PersonBundle\Entity\AccompanyingPeriod', 'Chill\PersonBundle\Entity\SocialWork\SocialAction'], + ], [ + 'name' => ['fr' => 'AIDE ALIMENTAIRE'], + 'desc' => 'stocké sur openstack comedienbe', + 'file' => 'AIDE_ALIMENTAIRE.docx', + 'context' => 'Chill\DocGeneratorBundle\Context\HouseholdMemberSelectionContext', + 'entities' => ['Chill\PersonBundle\Entity\AccompanyingPeriod', 'Chill\PersonBundle\Entity\SocialWork\SocialAction'], + ], + ]; + + foreach ($templates as $template) { + + print('Adding doc generator templates '.$template['file'].")\n"); + + $newTemplate = (new DocGeneratorTemplate()) + ->setName($template['name']) + ->setDescription($template['desc']) + ->setFile($template['file']) + ->setContext($template['context']) + ->setEntities($template['entities']) + ; + + $manager->persist($newTemplate); + + $manager->flush(); + } + } +} diff --git a/src/Bundle/ChillDocGeneratorBundle/DependencyInjection/ChillDocGeneratorExtension.php b/src/Bundle/ChillDocGeneratorBundle/DependencyInjection/ChillDocGeneratorExtension.php new file mode 100644 index 000000000..24f3a2d01 --- /dev/null +++ b/src/Bundle/ChillDocGeneratorBundle/DependencyInjection/ChillDocGeneratorExtension.php @@ -0,0 +1,81 @@ +processConfiguration($configuration, $configs); + + $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); + $loader->load('services.yml'); + $loader->load('services/controller.yml'); + $loader->load('services/fixtures.yml'); + $loader->load('services/form.yml'); + } + + public function prepend(ContainerBuilder $container) + { + $this->preprendRoutes($container); + $this->prependCruds($container); + } + + protected function preprendRoutes(ContainerBuilder $container) + { + $container->prependExtensionConfig('chill_main', array( + 'routing' => array( + 'resources' => array( + '@ChillDocGeneratorBundle/Resources/config/routes.yml' + ) + ) + )); + } + + /** + * @param ContainerBuilder $container + */ + protected function prependCruds(ContainerBuilder $container) + { + $container->prependExtensionConfig('chill_main', [ + 'cruds' => [ + [ + 'class' => \Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate::class, + 'name' => 'docgen_template', + 'base_path' => '/admin/docgen/template', + 'form_class' => \Chill\DocGeneratorBundle\Form\DocGeneratorTemplateType::class, + 'controller' => \Chill\DocGeneratorBundle\Controller\AdminDocGeneratorTemplateController::class, + 'actions' => [ + 'index' => [ + 'template' => '@ChillDocGenerator/Admin/DocGeneratorTemplate/index.html.twig', + 'role' => 'ROLE_ADMIN' + ], + 'new' => [ + 'role' => 'ROLE_ADMIN', + 'template' => '@ChillDocGenerator/Admin/DocGeneratorTemplate/new.html.twig', + ], + 'edit' => [ + 'role' => 'ROLE_ADMIN', + 'template' => '@ChillDocGenerator/Admin/DocGeneratorTemplate/edit.html.twig', + ] + ] + ] + ] + ]); + } +} diff --git a/src/Bundle/ChillDocGeneratorBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillDocGeneratorBundle/DependencyInjection/Configuration.php new file mode 100644 index 000000000..def8043a4 --- /dev/null +++ b/src/Bundle/ChillDocGeneratorBundle/DependencyInjection/Configuration.php @@ -0,0 +1,29 @@ +getRootNode('chill_calendar'); + + // Here you should define the parameters that are allowed to + // configure your bundle. See the documentation linked above for + // more information on that topic. + + return $treeBuilder; + } +} diff --git a/src/Bundle/ChillDocGeneratorBundle/Entity/DocGeneratorTemplate.php b/src/Bundle/ChillDocGeneratorBundle/Entity/DocGeneratorTemplate.php new file mode 100644 index 000000000..bf9c89839 --- /dev/null +++ b/src/Bundle/ChillDocGeneratorBundle/Entity/DocGeneratorTemplate.php @@ -0,0 +1,123 @@ +id; + } + + public function getName(): ?array + { + return $this->name; + } + + public function setName(array $name): self + { + $this->name = $name; + + return $this; + } + + public function getDescription(): ?string + { + return $this->description; + } + + public function setDescription(?string $description): self + { + $this->description = $description; + + return $this; + } + + public function getFile(): ?string + { + return $this->file; + } + + public function setFile(string $file): self + { + $this->file = $file; + + return $this; + } + + public function getEntities(): ?array + { + return $this->entities; + } + + public function setEntities(array $entities): self + { + $this->entities = $entities; + + return $this; + } + + public function getContext(): ?string + { + return $this->context; + } + + public function setContext(string $context): self + { + $this->context = $context; + + return $this; + } +} diff --git a/src/Bundle/ChillDocGeneratorBundle/Form/DocGeneratorTemplateType.php b/src/Bundle/ChillDocGeneratorBundle/Form/DocGeneratorTemplateType.php new file mode 100644 index 000000000..a0f36da0a --- /dev/null +++ b/src/Bundle/ChillDocGeneratorBundle/Form/DocGeneratorTemplateType.php @@ -0,0 +1,38 @@ +add('name', TranslatableStringFormType::class, [ + 'label' => 'Nom' + ]) + ->add('description') + ->add('file') + ; + } + + /** + * @param OptionsResolver $resolver + */ + public function configureOptions(OptionsResolver $resolver) + { + $resolver + ->setDefault('class', DocGeneratorTemplate::class) + ; + } +} diff --git a/src/Bundle/ChillDocGeneratorBundle/LICENSE b/src/Bundle/ChillDocGeneratorBundle/LICENSE new file mode 100644 index 000000000..2def0e883 --- /dev/null +++ b/src/Bundle/ChillDocGeneratorBundle/LICENSE @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. \ No newline at end of file diff --git a/src/Bundle/ChillDocGeneratorBundle/README.md b/src/Bundle/ChillDocGeneratorBundle/README.md new file mode 100644 index 000000000..8739b5395 --- /dev/null +++ b/src/Bundle/ChillDocGeneratorBundle/README.md @@ -0,0 +1,5 @@ +Doc generator bundle +==================== + +This bundle generates documents (from templates) + diff --git a/src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepository.php b/src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepository.php new file mode 100644 index 000000000..83f206d4b --- /dev/null +++ b/src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepository.php @@ -0,0 +1,21 @@ +{{ 'Title'|trans }} + {{ 'File'|trans }} + {% endblock %} + + {% block table_entities_tbody %} + {% for entity in entities %} + + {{ entity.name | localize_translatable_string }} + {{ entity.file }} + + {% endfor %} + {% endblock %} + {% endembed %} +{% endblock %} diff --git a/src/Bundle/ChillDocGeneratorBundle/Resources/view/Admin/DocGeneratorTemplate/new.twig.html b/src/Bundle/ChillDocGeneratorBundle/Resources/view/Admin/DocGeneratorTemplate/new.twig.html new file mode 100644 index 000000000..f31ac39c9 --- /dev/null +++ b/src/Bundle/ChillDocGeneratorBundle/Resources/view/Admin/DocGeneratorTemplate/new.twig.html @@ -0,0 +1,11 @@ +{% extends '@ChillPerson/Admin/layout.html.twig' %} + +{% block title %} + {% include('@ChillMain/CRUD/_new_title.html.twig') %} +{% endblock %} + +{% block layout_wvm_content %} + {% embed '@ChillMain/CRUD/_new_content.html.twig' %} + {% block content_form_actions_save_and_show %}{% endblock %} + {% endembed %} +{% endblock %} diff --git a/src/Bundle/ChillDocGeneratorBundle/chill.webpack.config.js b/src/Bundle/ChillDocGeneratorBundle/chill.webpack.config.js new file mode 100644 index 000000000..d894be9b0 --- /dev/null +++ b/src/Bundle/ChillDocGeneratorBundle/chill.webpack.config.js @@ -0,0 +1,6 @@ +// this file loads all assets from the Chill DocGenerator bundle +module.exports = function(encore, entries) { + encore.addAliases({ + ChillDocGeneratorAssets: __dirname + '/Resources/public' + }); +}; diff --git a/src/Bundle/ChillDocGeneratorBundle/composer.json b/src/Bundle/ChillDocGeneratorBundle/composer.json new file mode 100644 index 000000000..4ae119636 --- /dev/null +++ b/src/Bundle/ChillDocGeneratorBundle/composer.json @@ -0,0 +1,30 @@ +{ + "name": "chill-project/docgen", + "description": "This bundle extends chill for generation of documents", + "type": "symfony-bundle", + "license": "AGPL-3.0-or-later", + "keywords" : ["chill", "social work"], + "homepage" : "hhttps://gitlab.com/Chill-Projet/chill-bundles/", + "autoload": { + "psr-4": { "Chill\\DocGeneratorBundle\\": "" } + }, + "autoload-dev": { + "classmap": [ "Resources/test/Fixtures/App/app/AppKernel.php" ] + }, + "authors": [ + { + "name": "Champs-Libres", + "email": "info@champs-libres.coop" + } + ], + "require": { + }, + "require-dev": { + }, + "extra": { + "app-migrations-dir": "Resources/test/Fixtures/App/app/DoctrineMigrations", + "symfony-app-dir": "Test/Fixtures/App/app/" + }, + "minimum-stability": "dev", + "prefer-stable": true +} diff --git a/src/Bundle/ChillDocGeneratorBundle/migrations/Version20210805162522.php b/src/Bundle/ChillDocGeneratorBundle/migrations/Version20210805162522.php new file mode 100644 index 000000000..26a6c3d56 --- /dev/null +++ b/src/Bundle/ChillDocGeneratorBundle/migrations/Version20210805162522.php @@ -0,0 +1,31 @@ +addSql('CREATE SEQUENCE chill_docgen_template_id_seq INCREMENT BY 1 MINVALUE 1 START 1'); + $this->addSql('CREATE TABLE chill_docgen_template (id INT NOT NULL, name JSON NOT NULL, description TEXT DEFAULT NULL, file VARCHAR(255) NOT NULL, PRIMARY KEY(id))'); + } + + public function down(Schema $schema): void + { + $this->addSql('DROP SEQUENCE chill_docgen_template_id_seq CASCADE'); + $this->addSql('DROP TABLE chill_docgen_template'); + } +} diff --git a/src/Bundle/ChillDocGeneratorBundle/migrations/Version20210812214310.php b/src/Bundle/ChillDocGeneratorBundle/migrations/Version20210812214310.php new file mode 100644 index 000000000..c055bf428 --- /dev/null +++ b/src/Bundle/ChillDocGeneratorBundle/migrations/Version20210812214310.php @@ -0,0 +1,34 @@ +addSql('ALTER TABLE chill_docgen_template ADD entities TEXT'); + $this->addSql('ALTER TABLE chill_docgen_template ADD context VARCHAR(255)'); + $this->addSql('COMMENT ON COLUMN chill_docgen_template.entities IS \'(DC2Type:simple_array)\''); + $this->addSql('COMMENT ON COLUMN chill_docgen_template.name IS \'(DC2Type:json_array)\''); + } + + public function down(Schema $schema): void + { + $this->addSql('ALTER TABLE chill_docgen_template DROP entities'); + $this->addSql('ALTER TABLE chill_docgen_template DROP context'); + $this->addSql('COMMENT ON COLUMN chill_docgen_template.name IS NULL'); + } +} diff --git a/src/Bundle/ChillDocGeneratorBundle/translations/messages.fr.yml b/src/Bundle/ChillDocGeneratorBundle/translations/messages.fr.yml new file mode 100644 index 000000000..e69de29bb diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php index 6826f854c..1637ee098 100644 --- a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php +++ b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php @@ -32,9 +32,8 @@ use Chill\MainBundle\Doctrine\DQL\JsonAggregate; use Chill\MainBundle\Doctrine\DQL\JsonbExistsInArray; use Chill\MainBundle\Doctrine\DQL\Similarity; use Chill\MainBundle\Doctrine\DQL\OverlapsI; -use Symfony\Component\DependencyInjection\Definition; -use Symfony\Component\DependencyInjection\Reference; use Chill\MainBundle\Doctrine\DQL\Replace; +use Chill\MainBundle\Doctrine\ORM\Hydration\FlatHierarchyEntityHydrator; use Chill\MainBundle\Doctrine\Type\NativeDateIntervalType; use Chill\MainBundle\Doctrine\Type\PointType; use Symfony\Component\HttpFoundation\Request; @@ -186,6 +185,9 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface, 'OVERLAPSI' => OverlapsI::class, ], ], + 'hydrators' => [ + 'chill_flat_hierarchy_list' => FlatHierarchyEntityHydrator::class, + ], ], ], ); diff --git a/src/Bundle/ChillMainBundle/Doctrine/ORM/Hydration/FlatHierarchyEntityHydrator.php b/src/Bundle/ChillMainBundle/Doctrine/ORM/Hydration/FlatHierarchyEntityHydrator.php new file mode 100644 index 000000000..c389b543d --- /dev/null +++ b/src/Bundle/ChillMainBundle/Doctrine/ORM/Hydration/FlatHierarchyEntityHydrator.php @@ -0,0 +1,47 @@ +flatListGenerator($this->buildChildrenHashmap(parent::hydrateAllData())))); + } + + private function flatListGenerator(array $hashMap, ?object $parent = null): Generator + { + $parent = null === $parent ? null : spl_object_id($parent); + $hashMap += [$parent => []]; + + foreach ($hashMap[$parent] as $node) { + yield spl_object_id($node) => $node; + yield from $this->flatListGenerator($hashMap, $node); + } + } + + private function buildChildrenHashmap(array $nodes): array + { + return array_reduce( + $nodes, + static function (array $collect, $node): array { + $parentId = (null === $parent = $node->getParent()) ? + null : + spl_object_id($parent); + + $collect[$parentId][] = $node; + + return $collect; + }, + [] + ); + } + +} diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss index 97c5e3cc9..20ce571ac 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss @@ -4,23 +4,153 @@ // Chill mixins @import './scss/mixins'; +// Chill buttons +@import './scss/buttons'; + +// Chill forms +@import './scss/forms'; + +// Chill record_actions +@import './scss/record_actions'; + // Chill entity render box system @import './scss/render_box'; // Chill flex responsive table/block presentation @import './scss/flex_table'; + /* - * Specific rules + * BASE LAYOUT POSITION */ -.custom_field_no_data, -.chill-no-data-statement { - font-style: italic; +body { + display: flex; + flex-direction: column; + min-height: 100vh; + footer { + margin-top: auto; + } +} + +header { + nav.navbar { + padding: 0; + a.navbar-brand img { + height: 50px; + margin: 8px 0; + } + div.navbar-collapse { + float: right; + } + ul.navbar-nav { + display: flex; + align-items: stretch; + li.nav-item { + display: flex; + &.btn { + padding-top: 0; + padding-bottom: 0; + } + & > a { + align-self: center; + } + form.form-inline { + align-self: center; + display: flex; + input.form-control { + align-self: center; + height: 32px; + } + } + } + } + div.dropdown-menu { + margin: 0; + padding: 0; + border-radius: 0; + a.dropdown-item { + width: 120%; + border: 0; + border-bottom: 1px solid $gray-200; + font-size: smaller; + i { + float: right; } + &:hover { + color: $gray-500 !important; } + } + } + + // fullwidth menu when navbar is collapsed + @media (max-width: 767px) { + & { + position: relative; + } + button.navbar-toggler { + float: right; + } + div.navbar-collapse { + float: none; + position: absolute; + top: 4em; + left: 0; + right: 0; + z-index: 2; + padding: 1em; + border-top: 1px solid shade-color($primary, 25%); + ul.navbar-nav { + display: grid; + grid-template-areas: + "sear sear sear" + "sect user lang"; + li.nav-item { + flex-direction: column; + border: 0; + a.nav-link {} + &.navigation-search { + grid-area: sear; + margin-bottom: 1em; + form { + width: 100%; + input.form-control {} + button.btn {} + } + } + &.nav-section { grid-area: sect; } + &.nav-user { grid-area: user; } + &.nav-language { grid-area: lang; } + } + li.dropdown { + &, & > * { + background-color: transparent !important; + } + a.dropdown-toggle {} + div.dropdown-menu { + display: block; + border: 0; + a.dropdown-item { + width: 100%; + border: 0; + border-top: 1px dotted $gray-200; + background-color: transparent !important; + } + } + } + } + } + } + + } } -// styles communs pour tous les bandeaux div.banner { + a { + text-decoration: none; + &.phone, + &.email { + color: $white; + } + } .id-number { font-weight: lighter; font-size: 50%; @@ -28,17 +158,220 @@ div.banner { &:before { content: '(n°'; } &:after { content: ')'; } } - a.phone, - a.email { - color: white; - } - ul.list-content { - //margin: 0 auto; - } span.age { margin-left: 0.5em; &:before { content: '('; } &:after { content: ')'; } } - +} + +div.vertical-menu { + border-radius: 0; + margin-top: 0.5rem; + a.list-group-item { + background-color: $chill-yellow; + border: 0; + margin-bottom: 0.25rem; + &:hover { + background-color: tint-color($chill-yellow, 20%) + } + } +} + +footer.footer { + background: $dark; + padding-top: 10px; + padding-bottom: 10px; + width: 100%; + p { + font-family: Open Sans; + font-weight: 300; + clear: both; + color: $white; + font-size: 0.9em; + line-height: 1.5em; + margin: auto; + max-width: 35em; + text-align: center; + a, a:hover { + text-decoration: underline; + } + } +} + + +/* + * SPECIFIC RULES + */ + +/// titles +h1, h2, +.h1, .h2 { + font-weight: $headings-font-weight + 200; +} + +/// typography +.open_sansbold { + font-weight: bold; +} + +/// no borders on head table +table.table-bordered { + thead, thead * { + border: 0 !important; + text-align: center; + } +} + +/// comments quotes +.chill-user-quote { + border-left: 10px solid $yellow; + margin: 1.5em 10px; + padding: 0.5em 15px; + background-color: $gray-200; + color: $gray-800; + font-size: 90%; + + // test a bottom right decoration (to be confirmed) + &.test { + position: relative; + &:after { + content: ''; + position: absolute; + width: 0px; height: 0px; + bottom: 0; right: 0; + background: $white; + border-top: 10px solid $gray-200; + border-left: 10px solid $gray-200; + border-right: 10px solid $white; + border-bottom: 10px solid $white; + } + } + + // ckeditor citation + blockquote p { + font-style: italic; + padding-left: 2em; + quotes: "“" "„"; + position: relative; + &:before { + content: open-quote; + font-size: 400%; + color: $gray-400; + position: absolute; + top: -25px; + left: 0; + } + } +} + +/// display definition list +// with dt and dd on same line + +dl.definition-inline { + dd { + display: inline; + margin: 0; + &:after{ + display: block; + content: ''; + } + } + dt{ + display: inline-block; + min-width: 200px; + } +} + + +/// when there is no data +.custom_field_no_data, +.chill-no-data-statement { + font-style: italic; +} + +//// still used ? +// move from chillmain.css, converted to sass + +div#usefulbar { + background-color: $yellow; + z-index: 1000; + padding-right: 15px; + + form { + margin: 0; + } + i.menu { + font-size: 2em; + } + ul { + display: flex; + justify-content: flex-end; + margin: 0; + padding-top: 5px; + padding-right: 10px; + } + li { + color: $white; + margin-left: 10px; + a { + color: $white; + text-shadow: 0px 0px 1px $gray-600; + } + i.icon-user-add { + &:before { + vertical-align: -5px; + } + } + &#search_element { + text-align: right; + div#search_form { + margin: 0; + padding: 0; + div, .field { + margin: 0; + } + button { + color: $white; + border: none; + bottom: -2px; + height: 35px; + } + } + } + } +} + +div#flashMessages { + margin-top: 20px; + .flash-notice { + margin-top: 10px; + margin-bottom: 10px; + } +} + +.personName { + font-variant: small-caps; + text-transform: capitalize; +} + +// probably used in client chill. +// think to rename like above +input.belgian_national_number_inversed_date { + width: 7em; + margin-right: 1em; +} +input.belgian_national_number_daily_counter { + width: 4em; + margin-right: 1em; +} +input.belgian_national_number_control_digit { + width: 3em; +} + +// +input.belgian_national_number { + &.inversed_date {} + &.daily_counter {} + &.control_digit {} } diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/css/chillmain.css b/src/Bundle/ChillMainBundle/Resources/public/chill/css/chillmain.css deleted file mode 100644 index 85c247173..000000000 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/css/chillmain.css +++ /dev/null @@ -1,25 +0,0 @@ -div#usefulbar { background-color: #fbba3a; z-index: 1000; padding-right: 15px; } -div#usefulbar form { margin: 0; } -div#usefulbar i.menu { font-size: 2em; } -div#usefulbar ul { display: flex; justify-content: flex-end; margin: 0; padding-top: 5px; padding-right: 10px; } -div#usefulbar li { color: white; margin-left: 10px; } -div#usefulbar li a { color: white; text-shadow: 0px 0px 1px #555; } -div#usefulbar li i.icon-user-add:before { vertical-align: -5px; } -div#usefulbar li#search_element { text-align: right; } -div#usefulbar li#search_element div#search_form { margin: 0; padding: 0; } -div#usefulbar li#search_element div#search_form div { margin: 0; } -div#usefulbar li#search_element div#search_form .field { margin: 0; } -div#usefulbar li#search_element div#search_form button { color: white; border: none; bottom: -2px; height: 35px; } - -div#flashMessages { margin-top: 20px; } -div#flashMessages .flash-notice { margin-top: 10px; margin-bottom: 10px; } - -.personName { font-variant: small-caps; text-transform: capitalize; } - -.personName { text-transform: capitalize; } - -input.belgian_national_number_inversed_date { width: 7em; margin-right: 1em; } - -input.belgian_national_number_daily_counter { width: 4em; margin-right: 1em; } - -input.belgian_national_number_control_digit { width: 3em; } \ No newline at end of file diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/index.js b/src/Bundle/ChillMainBundle/Resources/public/chill/index.js index cf7365631..2e13bcc06 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/index.js +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/index.js @@ -14,12 +14,12 @@ global.select2 = select2; require('select2/dist/css/select2.css'); require('select2-bootstrap-theme/dist/select2-bootstrap.css'); + /* * Load Chill themes assets */ require('./chillmain.scss'); -require('./css/chillmain.css'); import { chill } from './js/chill.js'; global.chill = chill; @@ -34,6 +34,7 @@ require('./img/favicon.ico'); require('./img/logo-chill-sans-slogan_white.png'); require('./img/logo-chill-outil-accompagnement_white.png'); + /* * Load local libs * Some libs are only used in a few pages, they are loaded on a case by case basis @@ -45,7 +46,6 @@ require('../lib/breadcrumb/index.js'); require('../lib/download-report/index.js'); require('../lib/select_interactive_loading/index.js'); require('../lib/export-list/index.js'); -require('../lib/entity/index.js'); //require('../lib/show_hide/index.js'); //require('../lib/tabs/index.js'); diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/custom/_buttons.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss similarity index 89% rename from src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/custom/_buttons.scss rename to src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss index 6264a3a95..c2995e57d 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/custom/_buttons.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss @@ -62,10 +62,10 @@ $chill-theme-buttons: ( &.btn-view::before, &.btn-save::before, &.btn-duplicate::before, - &.btn-not-duplicate::before, - &.btn-submit::before, - &.btn-reset::before, - &.btn-action::before, + // &.btn-not-duplicate::before, + // &.btn-submit::before, + // &.btn-reset::before, + // &.btn-action::before, &.btn-delete::before, &.btn-remove::before, &.btn-cancel::before { @@ -101,3 +101,13 @@ $chill-theme-buttons: ( color: $light; } } + +/// allow to hide icon (herited from scratch) +.btn { + &.change-icon { + &::before { + content: ''; + margin-right: 0; + } + } +} diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss index c01ebc41d..c942bb709 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss @@ -1,59 +1,80 @@ /* * FLEX RESPONSIVE TABLE/BLOCK PRESENTATION */ + div.flex-bloc, div.flex-table { + display: flex; + align-items: stretch; + align-content: stretch; + box-sizing: border-box; + margin: 1.5em 0; + + div.item-bloc { + display: flex; + @include border-collapse; + padding: 1em; + + div.item-row { + display: flex; + + div.item-col:last-child { + display: flex; + } + } + } + h2, h3, h4, dl, p { margin: 0; } h2, h3, h4 { - color: var(--bs-chill-blue); + color: $blue; } - div.item-bloc { - @include border-collapse; + + ul.record_actions { + margin: 0; + li { + margin-right: 5px; + } } } /* * Bloc appearance */ + div.flex-bloc { - box-sizing: border-box; - display: flex; flex-direction: row; flex-wrap: wrap; - align-items: stretch; - align-content: stretch; div.item-bloc { flex-grow: 0; flex-shrink: 1; flex-basis: auto; - margin: 0; - padding: 1em; - display: flex; flex-direction: column; + margin: 0; div.item-row { flex-grow: 1; flex-shrink: 1; flex-basis: auto; - display: flex; flex-direction: column; div.item-col { + &.separator { + margin-top: 0.5em; + border-top: 1px dotted $gray-900; + padding-top: 0.5em; + } + &:first-child { flex-grow: 0; flex-shrink: 0; flex-basis: auto; - padding-bottom: 0.5em; - border-bottom: 1px dotted #0000004f; - margin-bottom: 0.5em; } + &:last-child { flex-grow: 1; flex-shrink: 1; flex-basis: auto; - display: flex; - .list-content { // ul, dl, or div - } ul.record_actions { - margin: 0; align-self: flex-end; flex-grow: 1; flex-shrink: 0; flex-basis: auto; + margin: 0; + li { margin-right: 5px; } @@ -67,51 +88,47 @@ div.flex-bloc { /* * Table appearance */ + div.flex-table { - display: flex; flex-direction: column; - align-items: stretch; - align-content: stretch; div.item-bloc { - display: flex; flex-direction: column; - padding: 1em; + &:nth-child(even) { background-color: $gray-200; + + .chill-user-quote { + background-color: shade-color($gray-200, 5%) + } } div.item-row { - display: flex; flex-direction: row; - &:not(:first-child) { + + &.separator { margin-top: 0.5em; - border-top: 1px dotted #0000004f; + border-top: 1px dotted $gray-900; padding-top: 0.5em; - flex-direction: column; + //flex-direction: column; } div.item-col { &:first-child { - flex-grow: 0; flex-shrink: 0; flex-basis: 33%; + flex-grow: 0; flex-shrink: 0; flex-basis: auto; } + &:last-child { flex-grow: 1; flex-shrink: 1; flex-basis: auto; - display: flex; justify-content: flex-end; - .list-content { // ul, dl, or div - } ul.record_actions { - margin: 0; - align-self: flex-start; flex-grow: 1; flex-shrink: 0; flex-basis: auto; - li { - margin-right: 5px; - } + align-self: flex-start; } } } + @media only screen and (max-width: 900px) { flex-direction: column; div.item-col { @@ -122,9 +139,6 @@ div.flex-table { } } } - - // neutralize - div.chill_address div.chill_address_address p { text-indent: 0; } } } } diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/forms.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/forms.scss new file mode 100644 index 000000000..0ae568244 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/forms.scss @@ -0,0 +1,44 @@ +/// forms +form { + + /* avoid useless html in first level of the custom fields row loop in forms + * (better should to improve the loop) + */ + & > div.container-fluid { + & > div.row > .parent { + padding: 0; + & div.cf-fields span.cf-title { + margin: 1em -15px 0; + width: calc(100% + 30px); + @include title_in_form; + } + } + } + + fieldset { + margin-top: 1em; + & > legend { + @include title_in_form; + } + } + + // customfields titles in form + span.cf-title { + @include title_in_form; + } + + label { + display: inline; + &.required:after { + content: " *"; + color: $red; + } + } +} + +.col-form-label { + padding-top: .5em; + padding-bottom: .5em; + font-weight: 700; + margin-bottom: .375em; +} diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/mixins.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/mixins.scss index 22e1d310e..cccb01502 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/mixins.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/mixins.scss @@ -1,4 +1,18 @@ +// +// Titles in forms +// + +@mixin title_in_form { + font-size: 1.438em; + font-weight: 700; + width: 100%; + border-bottom: 3px solid $gray-200; + margin-bottom: 1em; + display: block; +} + + // We use box-shadow instead of border // to avoid to manage border double-width // Then we can simulate border-collapse: collapse (table) diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/custom/_record_actions.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/record_actions.scss similarity index 71% rename from src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/custom/_record_actions.scss rename to src/Bundle/ChillMainBundle/Resources/public/chill/scss/record_actions.scss index 8ddc1b009..efedac51d 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/custom/_record_actions.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/record_actions.scss @@ -1,13 +1,22 @@ -ul.record_actions, -ul.record_actions_column { +ul.record_actions { display: flex; + flex-direction: row; + flex-wrap: wrap-reverse; justify-content: flex-end; + padding: 0.5em 0; - &.record_actions--left { + &.column { + flex-direction: column; + } + + &.left { justify-content: flex-start; } - padding: 0.5em 0; - flex-wrap: wrap-reverse; + + &.sticky-form-buttons { + padding-left: 1em; + padding-right: 1em; + } li { display: inline-block; @@ -18,37 +27,33 @@ ul.record_actions_column { &:last-child { margin-right: 0; } - } - li.cancel { - order: 1; - margin-right: auto; + &.cancel { + order: 1; + margin-right: auto; + } } } - -ul.record_actions { - flex-direction: row; -} - -ul.record_actions_column { - flex-direction: column; -} - -ul.record_actions.sticky-form-buttons { - padding-left: 1em; - padding-right: 1em; +.sticky-form-buttons { + margin-top: 4em; + background-color: $beige; + position: sticky; + bottom: 0.3em; + text-align: center; + display: flex; + padding: 0.8em 1.6em; + border-radius: 0; } +/// EXCEPTIONS // inside table exceptions table { - td ul.record_actions, ul.record_actions_small { li { margin-right: 0.2em; } } - ul.record_actions { margin: 0; padding: 0.5em; diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss index dd1dc12c5..68bbe2afc 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss @@ -13,12 +13,18 @@ section.chill-entity { } // specific rules +// all render box doesn't use a section tag ! .chill-entity { // used for: entity-person, entity-thirdparty &.entity-person, &.entity-thirdparty { + span.entity-raw { + & > span:not(:first-child):before { + content: " "; + } + } div.entity-label { div.denomination { &.h3 { @@ -92,4 +98,19 @@ section.chill-entity { &.address-until {} } } + + // used for comment-embeddable + &.entity-comment-embeddable { + width: 100%; + div.metadata { + font-size: smaller; + color: $gray-600; + span.user, span.date { + text-decoration: underline dotted; + &:hover { + color: $gray-700; + } + } + } + } } diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/entity/comment_embeddable.scss b/src/Bundle/ChillMainBundle/Resources/public/lib/entity/comment_embeddable.scss deleted file mode 100644 index e45173e56..000000000 --- a/src/Bundle/ChillMainBundle/Resources/public/lib/entity/comment_embeddable.scss +++ /dev/null @@ -1,6 +0,0 @@ -.chill-entity__comment-embeddable { - .chill-entity__comment-embeddable__metadata { - font-size: smaller; - color: var(--chill-light-gray); - } -} \ No newline at end of file diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/entity/index.js b/src/Bundle/ChillMainBundle/Resources/public/lib/entity/index.js deleted file mode 100644 index c739899a5..000000000 --- a/src/Bundle/ChillMainBundle/Resources/public/lib/entity/index.js +++ /dev/null @@ -1,2 +0,0 @@ -// css classes to render entities -require('./comment_embeddable.scss'); diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/_custom.scss b/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/_custom.scss index 17ca68d49..9d632026f 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/_custom.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/_custom.scss @@ -1,284 +1,6 @@ /* * These custom styles will override bootstrap enabled stylesheets + * in mod_bootstrap entrypoint */ -/// chill buttons -@import 'custom/_buttons'; -// chill record_actions -@import 'custom/_record_actions'; - -/// titles -h1, h2, .h1, .h2 { - font-weight: $headings-font-weight + 200; -} - -/// typography -.open_sansbold { - font-weight: bold; -} - -/// forms - -@mixin title_in_form { - font-size: 1.438em; - font-weight: 700; - width: 100%; - border-bottom: 3px solid $gray-200; - margin-bottom: 1em; - display: block; -} - -.col-form-label { - padding-top: .5em; - padding-bottom: .5em; - font-weight: 700; - margin-bottom: .375em; -} - -form { - /* avoid useless html in first level of the custom fields row loop in forms - * (better should to improve the loop) - */ - & > div.container-fluid { - & > div.row > .parent { - padding: 0; - & div.cf-fields span.cf-title { - margin: 1em -15px 0; - width: calc(100% + 30px); - @include title_in_form; - } - } - } - fieldset { - margin-top: 1em; - & > legend { - @include title_in_form; - } - } - label { - display: inline; - &.required:after { - content: " *"; - color: $red; - } - } -} - -/// table - -table.table-bordered { - thead, thead * { - border: 0 !important; - text-align: center; - } -} - -/// chill elements of design - -.sticky-form-buttons { - margin-top: 4em; - background-color: $beige; - position: sticky; - bottom: 0.3em; - text-align: center; - display: flex; - padding: 0.8em 1.6em; - border-radius: 0; -} - -.chill-user-quote { - border-left: 10px solid $yellow; - margin: 1.5em 10px; - padding: 0.5em 15px; - quotes: "\201C" "\201D" "\2018" "\2019"; - background-color: $gray-200; - blockquote { - border-left: 0.4em solid $gray-400; - padding-left: 0.9em; - margin-left: 0.9em; - font-style: italic; - } -} - -div.chill_address { - div.chill_address_address { - margin: 0.7em 0; - font-size: 98%; - font-variant: small-caps; - p { - display: inline-block; - margin: 0 0 0 1.5em; - text-indent: -1.5em; - } - } -} - -/// base layout positions - -body { - display: flex; - flex-direction: column; - min-height: 100vh; - footer { - margin-top: auto; - } -} - -header { - nav.navbar { - padding: 0; - a.navbar-brand img { - height: 50px; - margin: 8px 0; - } - div.navbar-collapse { - float: right; - } - ul.navbar-nav { - display: flex; - align-items: stretch; - li.nav-item { - display: flex; - &.btn { - padding-top: 0; - padding-bottom: 0; - } - & > a { - align-self: center; - } - form.form-inline { - align-self: center; - display: flex; - input.form-control { - align-self: center; - height: 32px; - } - } - } - } - div.dropdown-menu { - margin: 0; - padding: 0; - border-radius: 0; - a.dropdown-item { - width: 120%; - border: 0; - border-bottom: 1px solid $gray-200; - font-size: smaller; - i { - float: right; } - &:hover { - color: $gray-500 !important; } - } - } - - // fullwidth menu when navbar is collapsed - @media (max-width: 767px) { - & { - position: relative; - } - button.navbar-toggler { - float: right; - } - div.navbar-collapse { - float: none; - position: absolute; - top: 4em; - left: 0; - right: 0; - z-index: 2; - padding: 1em; - border-top: 1px solid shade-color($primary, 25%); - ul.navbar-nav { - display: grid; - grid-template-areas: - "sear sear sear" - "sect user lang"; - li.nav-item { - flex-direction: column; - border: 0; - a.nav-link {} - &.navigation-search { - grid-area: sear; - margin-bottom: 1em; - form { - width: 100%; - input.form-control {} - button.btn {} - } - } - &.nav-section { grid-area: sect; } - &.nav-user { grid-area: user; } - &.nav-language { grid-area: lang; } - } - li.dropdown { - &, & > * { - background-color: transparent !important; - } - a.dropdown-toggle {} - div.dropdown-menu { - display: block; - border: 0; - a.dropdown-item { - width: 100%; - border: 0; - border-top: 1px dotted $gray-200; - background-color: transparent !important; - } - } - } - } - } - } - - } -} - -div.banner { - div.header-name, - div.header-details { - div.row > div:first-child { - @media (min-width: 576px) { - //margin-left: 1.5em; - } - } - } - a { - text-decoration: none; - } -} - -div.vertical-menu { - border-radius: 0; - margin-top: 0.5rem; - a.list-group-item { - background-color: $chill-yellow; - border: 0; - margin-bottom: 0.25rem; - &:hover { - background-color: tint-color($chill-yellow, 20%) - } - } -} - -footer.footer { - background: $dark; - padding-top: 10px; - padding-bottom: 10px; - width: 100%; - p { - font-family: Open Sans; - font-weight: 300; - clear: both; - color: $white; - font-size: 0.9em; - line-height: 1.5em; - margin: auto; - max-width: 35em; - text-align: center; - a, a:hover { - text-decoration: underline; - } - } -} diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/shared.scss b/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/_shared.scss similarity index 100% rename from src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/shared.scss rename to src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/_shared.scss diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/custom/_variables.scss b/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/custom/_variables.scss index dc2a722cf..04cf765e0 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/custom/_variables.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/custom/_variables.scss @@ -14,7 +14,7 @@ $gray-400: #ced4da !default; $gray-500: #b2b2b2 !default; $gray-600: #6c757d !default; $gray-700: #495057 !default; -$gray-800: #333333 !default; +$gray-800: #2c2d2f !default; $gray-900: #212529 !default; $black: #111 !default; // scss-docs-end gray-color-variables @@ -160,7 +160,7 @@ $chill-pink: $pink; $chill-gray: $gray-600; $chill-dark-gray: $gray-800; $chill-light-gray: $gray-200; -$chill-llight-gray: $gray-100; +$chill-llight-gray: $gray-100; // scss-docs-end theme-color-variables // scss-docs-start theme-colors-map @@ -176,7 +176,7 @@ $theme-colors: ( ) !default; // scss-docs-end theme-colors-map -$chill-colors: ( +$chill-colors: ( "chill-blue": $chill-blue, "chill-green": $chill-green, "chill-green-dark": $chill-green-dark, @@ -382,7 +382,7 @@ $border-color: $gray-300 !default; // scss-docs-end border-variables // scss-docs-start border-radius-variables -$border-radius: .25rem !default; // <== +$border-radius: .25rem !default; // <== $border-radius-sm: .2rem !default; $border-radius-lg: .3rem !default; $border-radius-pill: 50rem !default; diff --git a/src/Bundle/ChillMainBundle/Resources/views/Entity/CommentEmbeddable.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Entity/CommentEmbeddable.html.twig index c9b76451c..8adc9c17f 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Entity/CommentEmbeddable.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Entity/CommentEmbeddable.html.twig @@ -1,36 +1,45 @@ -{{ opening_box|raw }} -
    -
    - - {%- if options['limit_lines'] is not null -%} - {% set content = comment.comment|split('\n')|slice(0, options['limit_lines'])|join('\n') %} - {%- else -%} - {% set content = comment.comment %} - {%- endif -%} +{# + Template to render a comment -
    + OPTIONS + * disable_markdown bool + * limit_lines integer|null + * metadata bool + +#} +{{ opening_box|raw }} + {%- if options['limit_lines'] is not null -%} + {% set content = comment.comment|split('\n')|slice(0, options['limit_lines'])|join('\n') %} + {%- else -%} + {% set content = comment.comment %} + {%- endif -%} + +
    {% if options['disable_markdown'] %} {{ content|nl2br }} {% else %} {{ content|chill_markdown_to_html }} {% endif %} -
    -
    -
    -{% if options['metadata'] %} - -{% endif %} -{{ closing_box|raw }} \ No newline at end of file + + {% if options['metadata'] %} + + {% endif %} + +{{ closing_box|raw }} diff --git a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig index 140557d69..3b1fe5041 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig @@ -53,23 +53,30 @@ {% block sublayout_content %}
    - {% for flashMessage in app.session.flashbag.get('success') %} -
    - {{ flashMessage|raw }} -
    - {% endfor %} + {# Flash messages ! #} + {% if app.session.flashbag.keys()|length > 0 %} +
    - {% for flashMessage in app.session.flashbag.get('error') %} -
    - {{ flashMessage|raw }} -
    - {% endfor %} + {% for flashMessage in app.session.flashbag.get('success') %} +
    + {{ flashMessage|raw }} +
    + {% endfor %} - {% for flashMessage in app.session.flashbag.get('notice') %} -
    - {{ flashMessage|raw }} -
    - {% endfor %} + {% for flashMessage in app.session.flashbag.get('error') %} +
    + {{ flashMessage|raw }} +
    + {% endfor %} + + {% for flashMessage in app.session.flashbag.get('notice') %} +
    + {{ flashMessage|raw }} +
    + {% endfor %} + +
    + {% endif %} {% block content %}