Loading module/Application/config/merged/menu.config.php +35 −28 Changes for module/Application/config/merged/menu.config.php: 35 added lines, 28 removed lines. Original line number Diff line number Diff line Loading @@ -2,6 +2,7 @@ namespace Application; use Application\Controller\RessourceRh\RessourceRhController; use Application\Provider\Privilege\ActivitePrivileges; use Application\Provider\Privilege\AffectationPrivileges; use Application\Provider\Privilege\ApplicationPrivileges; Loading @@ -19,34 +20,40 @@ return [ 'route' => 'ressource-rh', 'roles' => [], 'pages' => [ [ 'label' => 'Status', 'route' => 'ressource-rh', 'privileges' => RessourceRhPrivileges::AFFICHER, 'dropdown-header' => true, 'icon' => 'fas fa-angle-right' ], [ 'label' => 'Correspondances', 'route' => 'ressource-rh', 'privileges' => RessourceRhPrivileges::AFFICHER, 'dropdown-header' => true, 'icon' => 'fas fa-angle-right' ], [ 'label' => 'Métiers', 'route' => 'ressource-rh', 'privileges' => RessourceRhPrivileges::AFFICHER, 'dropdown-header' => true, 'icon' => 'fas fa-angle-right' ], [ 'label' => 'Corps', 'route' => 'ressource-rh', 'privileges' => RessourceRhPrivileges::AFFICHER, 'dropdown-header' => true, 'icon' => 'fas fa-angle-right' ], // [ // 'label' => 'Status', // 'route' => 'ressource-rh', // 'privileges' => RessourceRhPrivileges::AFFICHER, // 'dropdown-header' => true, // 'icon' => 'fas fa-angle-right' // ], // [ // 'label' => 'Correspondances', // 'route' => 'ressource-rh', // 'privileges' => RessourceRhPrivileges::AFFICHER, // 'dropdown-header' => true, // 'icon' => 'fas fa-angle-right' // ], // [ // 'label' => 'Métiers', // 'route' => 'ressource-rh', // 'privileges' => RessourceRhPrivileges::AFFICHER, // 'dropdown-header' => true, // 'icon' => 'fas fa-angle-right' // ], // [ // 'label' => 'Corps', // //'route' => 'ressource-rh', // 'module' => 'Application', // 'controller' => RessourceRhController::class, // 'action' => 'creer-corps', // 'rel' => [ // 'id' => '1', // ], // 'privileges' => RessourceRhPrivileges::AFFICHER, // 'dropdown-header' => true, // 'icon' => 'fas fa-angle-right' // ], ], ], 'fiche-metier' => [ Loading module/Application/view/application/ressource-rh/index.phtml +10 −3 Changes for module/Application/view/application/ressource-rh/index.phtml: 10 added lines, 3 removed lines. Original line number Diff line number Diff line Loading @@ -22,7 +22,14 @@ $canEffacerRessource = $this->isAllowed(RessourceRhPrivileges::getResourceId( Ressources associées aux ressources humaines </h1> <a href="<?php echo $this->url('ressource-rh', [], ['fragment' => 'status']); ?>" class="btn btn-primary action">Status</a> <a href="<?php echo $this->url('ressource-rh', [], ['fragment' => 'correspondance']); ?>" class="btn btn-primary action">Correspondance</a> <a href="<?php echo $this->url('ressource-rh', [], ['fragment' => 'metier']); ?>" class="btn btn-primary action">Métier</a> <a href="<?php echo $this->url('ressource-rh', [], ['fragment' => 'corps']); ?>" class="btn btn-primary action">Corps</a> <div class="main"> <a name="status"></a> <div class="col-md-8"> <h2> Status des agents Loading Loading @@ -83,7 +90,7 @@ $canEffacerRessource = $this->isAllowed(RessourceRhPrivileges::getResourceId( </div> <div class="main"> <a name="correspondance"></a> <div class="col-md-8"> <h2> Liste des correspondances Loading Loading @@ -149,7 +156,7 @@ $canEffacerRessource = $this->isAllowed(RessourceRhPrivileges::getResourceId( <div class="main"> <a name="metier"></a> <div class="col-md-8"> <h2> Liste des métiers Loading Loading @@ -206,7 +213,7 @@ $canEffacerRessource = $this->isAllowed(RessourceRhPrivileges::getResourceId( </div> <div class="main"> <a name="corps"></a> <div class="col-md-8"> <h2> Liste des corps Loading module/Application/view/layout/layout.phtml +1 −1 Changes for module/Application/view/layout/layout.phtml: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -46,7 +46,7 @@ // $logo = "img/PrEECoG.svg"; // ?> <!-- <img style="width:50px;" src="--><?php //echo $logo; ?><!--">--> <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="50px" height="50px" viewBox="-0.5 -0.5 124 113"><defs/> <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="45px" height="45px" viewBox="-0.5 -0.5 124 113"><defs/> <path d="M 10 53 L 10 3 Q 10 -7 18.66 -2 L 105.34 48 Q 114 53 105.34 58 L 18.66 108 Q 10 113 10 103 Z" fill="#1ddb96" stroke="#19bd81" stroke-width="4" stroke-miterlimit="10" transform="rotate(-90,62,53)" pointer-events="none"/><ellipse cx="62" cy="66" rx="35" ry="35" fill="#f5f5f5" stroke="#666666" stroke-width="2" pointer-events="none"/><rect x="17" y="56" width="90" height="20" rx="3" ry="3" fill="#f5f5f5" stroke="#666666" stroke-width="2" transform="rotate(-90,62,66)" pointer-events="none"/><rect x="17" y="56" width="90" height="20" rx="3" ry="3" fill="#f5f5f5" stroke="#666666" stroke-width="2" transform="rotate(-45,62,66)" pointer-events="none"/><rect x="17" y="56" width="90" height="20" rx="3" ry="3" fill="#f5f5f5" stroke="#666666" stroke-width="2" pointer-events="none"/><rect x="17" y="56" width="90" height="20" rx="3" ry="3" fill="#f5f5f5" stroke="#666666" stroke-width="2" transform="rotate(-135,62,66)" pointer-events="none"/><ellipse cx="62" cy="66" rx="33.5" ry="33.5" fill="#f5f5f5" stroke="#f5f5f5" pointer-events="none"/><ellipse cx="62" cy="66" rx="17.5" ry="17.5" fill="#1ddb96" stroke="#666666" stroke-width="2" pointer-events="none"/> </svg> </div> Loading public/css/app.css +1 −1 Changes for public/css/app.css: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -89,7 +89,7 @@ dl.dl-horizontal dt:after { a.action { width: 20em; margin:10px; margin:1px; text-indent: 0em; } Loading Loading
module/Application/config/merged/menu.config.php +35 −28 Changes for module/Application/config/merged/menu.config.php: 35 added lines, 28 removed lines. Original line number Diff line number Diff line Loading @@ -2,6 +2,7 @@ namespace Application; use Application\Controller\RessourceRh\RessourceRhController; use Application\Provider\Privilege\ActivitePrivileges; use Application\Provider\Privilege\AffectationPrivileges; use Application\Provider\Privilege\ApplicationPrivileges; Loading @@ -19,34 +20,40 @@ return [ 'route' => 'ressource-rh', 'roles' => [], 'pages' => [ [ 'label' => 'Status', 'route' => 'ressource-rh', 'privileges' => RessourceRhPrivileges::AFFICHER, 'dropdown-header' => true, 'icon' => 'fas fa-angle-right' ], [ 'label' => 'Correspondances', 'route' => 'ressource-rh', 'privileges' => RessourceRhPrivileges::AFFICHER, 'dropdown-header' => true, 'icon' => 'fas fa-angle-right' ], [ 'label' => 'Métiers', 'route' => 'ressource-rh', 'privileges' => RessourceRhPrivileges::AFFICHER, 'dropdown-header' => true, 'icon' => 'fas fa-angle-right' ], [ 'label' => 'Corps', 'route' => 'ressource-rh', 'privileges' => RessourceRhPrivileges::AFFICHER, 'dropdown-header' => true, 'icon' => 'fas fa-angle-right' ], // [ // 'label' => 'Status', // 'route' => 'ressource-rh', // 'privileges' => RessourceRhPrivileges::AFFICHER, // 'dropdown-header' => true, // 'icon' => 'fas fa-angle-right' // ], // [ // 'label' => 'Correspondances', // 'route' => 'ressource-rh', // 'privileges' => RessourceRhPrivileges::AFFICHER, // 'dropdown-header' => true, // 'icon' => 'fas fa-angle-right' // ], // [ // 'label' => 'Métiers', // 'route' => 'ressource-rh', // 'privileges' => RessourceRhPrivileges::AFFICHER, // 'dropdown-header' => true, // 'icon' => 'fas fa-angle-right' // ], // [ // 'label' => 'Corps', // //'route' => 'ressource-rh', // 'module' => 'Application', // 'controller' => RessourceRhController::class, // 'action' => 'creer-corps', // 'rel' => [ // 'id' => '1', // ], // 'privileges' => RessourceRhPrivileges::AFFICHER, // 'dropdown-header' => true, // 'icon' => 'fas fa-angle-right' // ], ], ], 'fiche-metier' => [ Loading
module/Application/view/application/ressource-rh/index.phtml +10 −3 Changes for module/Application/view/application/ressource-rh/index.phtml: 10 added lines, 3 removed lines. Original line number Diff line number Diff line Loading @@ -22,7 +22,14 @@ $canEffacerRessource = $this->isAllowed(RessourceRhPrivileges::getResourceId( Ressources associées aux ressources humaines </h1> <a href="<?php echo $this->url('ressource-rh', [], ['fragment' => 'status']); ?>" class="btn btn-primary action">Status</a> <a href="<?php echo $this->url('ressource-rh', [], ['fragment' => 'correspondance']); ?>" class="btn btn-primary action">Correspondance</a> <a href="<?php echo $this->url('ressource-rh', [], ['fragment' => 'metier']); ?>" class="btn btn-primary action">Métier</a> <a href="<?php echo $this->url('ressource-rh', [], ['fragment' => 'corps']); ?>" class="btn btn-primary action">Corps</a> <div class="main"> <a name="status"></a> <div class="col-md-8"> <h2> Status des agents Loading Loading @@ -83,7 +90,7 @@ $canEffacerRessource = $this->isAllowed(RessourceRhPrivileges::getResourceId( </div> <div class="main"> <a name="correspondance"></a> <div class="col-md-8"> <h2> Liste des correspondances Loading Loading @@ -149,7 +156,7 @@ $canEffacerRessource = $this->isAllowed(RessourceRhPrivileges::getResourceId( <div class="main"> <a name="metier"></a> <div class="col-md-8"> <h2> Liste des métiers Loading Loading @@ -206,7 +213,7 @@ $canEffacerRessource = $this->isAllowed(RessourceRhPrivileges::getResourceId( </div> <div class="main"> <a name="corps"></a> <div class="col-md-8"> <h2> Liste des corps Loading
module/Application/view/layout/layout.phtml +1 −1 Changes for module/Application/view/layout/layout.phtml: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -46,7 +46,7 @@ // $logo = "img/PrEECoG.svg"; // ?> <!-- <img style="width:50px;" src="--><?php //echo $logo; ?><!--">--> <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="50px" height="50px" viewBox="-0.5 -0.5 124 113"><defs/> <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="45px" height="45px" viewBox="-0.5 -0.5 124 113"><defs/> <path d="M 10 53 L 10 3 Q 10 -7 18.66 -2 L 105.34 48 Q 114 53 105.34 58 L 18.66 108 Q 10 113 10 103 Z" fill="#1ddb96" stroke="#19bd81" stroke-width="4" stroke-miterlimit="10" transform="rotate(-90,62,53)" pointer-events="none"/><ellipse cx="62" cy="66" rx="35" ry="35" fill="#f5f5f5" stroke="#666666" stroke-width="2" pointer-events="none"/><rect x="17" y="56" width="90" height="20" rx="3" ry="3" fill="#f5f5f5" stroke="#666666" stroke-width="2" transform="rotate(-90,62,66)" pointer-events="none"/><rect x="17" y="56" width="90" height="20" rx="3" ry="3" fill="#f5f5f5" stroke="#666666" stroke-width="2" transform="rotate(-45,62,66)" pointer-events="none"/><rect x="17" y="56" width="90" height="20" rx="3" ry="3" fill="#f5f5f5" stroke="#666666" stroke-width="2" pointer-events="none"/><rect x="17" y="56" width="90" height="20" rx="3" ry="3" fill="#f5f5f5" stroke="#666666" stroke-width="2" transform="rotate(-135,62,66)" pointer-events="none"/><ellipse cx="62" cy="66" rx="33.5" ry="33.5" fill="#f5f5f5" stroke="#f5f5f5" pointer-events="none"/><ellipse cx="62" cy="66" rx="17.5" ry="17.5" fill="#1ddb96" stroke="#666666" stroke-width="2" pointer-events="none"/> </svg> </div> Loading
public/css/app.css +1 −1 Changes for public/css/app.css: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -89,7 +89,7 @@ dl.dl-horizontal dt:after { a.action { width: 20em; margin:10px; margin:1px; text-indent: 0em; } Loading