Skip to content
Snippets Groups Projects
Commit b26280af authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Merge remote-tracking branch 'origin/b23' into b23

parents 08818508 f20ecf46
No related branches found
No related tags found
No related merge requests found
...@@ -7,11 +7,10 @@ if ($c->getOption('maintenance') != 'no') { ...@@ -7,11 +7,10 @@ if ($c->getOption('maintenance') != 'no') {
$c->getInput(); $c->getInput();
} }
// Mise à jour du code source
$oa->run('update-code', false);
// Mise à jour de la base de données à partir d'un nouveau processus $bin = getcwd()."/bin/ose";
$oa->run('update-bdd', true); passthru("$bin update-code");
passthru("$bin update-bdd");
//Conclusion //Conclusion
$c->println("\nFin de la mise à jour."); $c->println("\nFin de la mise à jour.");
......
...@@ -10,6 +10,8 @@ $c->setInputOptions([ ...@@ -10,6 +10,8 @@ $c->setInputOptions([
$od = new OseDeploy($c); $od = new OseDeploy($c);
unlink(__FILE__);
$c->printMainTitle("Installation de OSE", 13); $c->printMainTitle("Installation de OSE", 13);
$c->check([ $c->check([
'git' => 'Gestionnaire de versions', 'git' => 'Gestionnaire de versions',
...@@ -163,8 +165,7 @@ copy($configFile, $osedir . '/config.local.php'); ...@@ -163,8 +165,7 @@ copy($configFile, $osedir . '/config.local.php');
$c->println("\nGénération des proxies pour l'ORM Doctrine", $c::COLOR_LIGHT_CYAN); $c->println("\nGénération des proxies pour l'ORM Doctrine", $c::COLOR_LIGHT_CYAN);
$c->exec([ $c->exec([
"cd $osedir", "cd $osedir",
"php vendor/bin/doctrine-module orm:generate-proxies", "php bin/ose clear-cache"
"chmod -R 777 cache/DoctrineProxy",
]); ]);
// Mise en place des tâches CRON ?? // Mise en place des tâches CRON ??
......
...@@ -36,7 +36,8 @@ SELECT ...@@ -36,7 +36,8 @@ SELECT
'1' code_origine, '1' code_origine,
i.id intervenant_id, i.id intervenant_id,
i.nom_usuel || ',' || i.prenom nom, i.nom_usuel || ',' || i.prenom nom,
t.prime_id prime_id t.prime_id prime_id,
t.date_declaration date_declaration
FROM FROM
( (
SELECT SELECT
...@@ -50,7 +51,8 @@ FROM ...@@ -50,7 +51,8 @@ FROM
SUM(hpm.total_paie) paie_mission, SUM(hpm.total_paie) paie_mission,
SUM(hpm.total_heures_a_payer) total_heures_a_payer, SUM(hpm.total_heures_a_payer) total_heures_a_payer,
SUM(hpm.total_heures_payees) total_heures_payees, SUM(hpm.total_heures_payees) total_heures_payees,
SUM(round(hpm.total_paie * 0.1, 2)) montant_prime SUM(round(hpm.total_paie * 0.1, 2)) montant_prime,
MAX(f.histo_creation) date_declaration
FROM FROM
mission_prime mp mission_prime mp
JOIN mission m ON JOIN mission m ON
...@@ -68,6 +70,7 @@ FROM ...@@ -68,6 +70,7 @@ FROM
JOIN periode p ON JOIN periode p ON
p.ecart_mois = ROUND(MONTHS_BETWEEN(m.date_fin, a.date_debut)+ 0.5) p.ecart_mois = ROUND(MONTHS_BETWEEN(m.date_fin, a.date_debut)+ 0.5)
AND p.enseignement = 0 AND p.enseignement = 0
JOIN fichier f ON f.id = mp.declaration_id and f.histo_destruction IS NULL
WHERE WHERE
--Il faut impérativement une prime validée --Il faut impérativement une prime validée
mp.declaration_id IS NOT NULL mp.declaration_id IS NOT NULL
......
...@@ -115,7 +115,8 @@ SELECT ...@@ -115,7 +115,8 @@ SELECT
0 heures, 0 heures,
vhr.heures heures_ref, vhr.heures heures_ref,
0 heures_non_payees, CASE WHEN mnp.id IS NOT NULL
THEN 1 ELSE 0 END heures_non_payees,
mnp.libelle_court motif_non_paiement, mnp.libelle_court motif_non_paiement,
t.libelle_court tag, t.libelle_court tag,
0 service_fi, 0 service_fi,
......
...@@ -460,8 +460,8 @@ class SihamConnecteur implements ConnecteurRhInterface ...@@ -460,8 +460,8 @@ class SihamConnecteur implements ConnecteurRhInterface
$infos['totalHeure'] = str_replace(',', '.', $mission->getHeures()); $infos['totalHeure'] = str_replace(',', '.', $mission->getHeures());
//On va chercher la valeur du taux de la mission //On va chercher la valeur du taux de la mission
$dateDebutMission = $mission->getDateDebut(); $dateDebutMission = $mission->getDateDebut();
$idTauxRemu = $mission->getTauxRemu()->getId(); $tauxRemu = $mission->getTauxRemu();
$valeurTaux = $this->getServiceTauxRemu()->getTauxRemuValeur($idTauxRemu)->getValeur(); $valeurTaux = $this->getServiceTauxRemu()->tauxValeur($tauxRemu, $dateDebutMission);
$infos['taux'] = str_replace(',', '.', $valeurTaux); $infos['taux'] = str_replace(',', '.', $valeurTaux);
} }
......
RewriteEngine On
# The following rule tells Apache that if the requested filename
# exists, simply serve it.
RewriteCond %{REQUEST_FILENAME} -s [OR]
RewriteCond %{REQUEST_FILENAME} -l [OR]
RewriteCond %{REQUEST_FILENAME} -d
RewriteRule ^.*$ - [L]
# The following rewrites all other queries to index.php. The
# condition ensures that if you are using Apache aliases to do
# mass virtual hosting or installed the project in a subdirectory,
# the base path will be prepended to allow proper resolution of
# the index.php file; it will work in non-aliased environments
# as well, providing a safe, one-size fits all solution.
RewriteCond %{REQUEST_URI}::$1 ^(/.+)/(.*)::\2$
RewriteRule ^(.*) - [E=BASE:%1]
RewriteRule ^(.*)$ %{ENV:BASE}/index.php [L]
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<system.webServer>
<rewrite>
<rules>
<rule name="File or directory rule" stopProcessing="true">
<match url="^.*$" />
<conditions logicalGrouping="MatchAny">
<add input="{REQUEST_FILENAME}"
matchType="IsFile" pattern=""
ignoreCase="false" />
<add input="{REQUEST_FILENAME}"
matchType="IsDirectory"
pattern=""
ignoreCase="false" />
</conditions>
<action type="None" />
</rule>
<rule name="Rewrite rule" stopProcessing="true">
<match url="^.*$" />
<action type="Rewrite" url="index.php" />
</rule>
</rules>
</rewrite>
</system.webServer>
</configuration>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment