From e668bdf240803bc4f08f38e4b502471759b49105 Mon Sep 17 00:00:00 2001 From: Michael RICOIS Date: Fri, 18 Oct 2013 13:04:08 +0000 Subject: [PATCH] Premier jet --- application/controllers/ReportController.php | 30 +++--- application/views/scripts/report/index.phtml | 6 +- .../Partner/Templates/indiscore3/bilans.phtml | 101 ++++++++++++++++-- .../indiscore3/finance/bilan/actif.phtml | 42 -------- .../indiscore3/finance/bilan/passif.phtml | 41 ------- .../indiscore3/finance/bilan/sig.phtml | 44 -------- scripts/build/configure.php | 1 - 7 files changed, 107 insertions(+), 158 deletions(-) delete mode 100644 library/Scores/Partner/Templates/indiscore3/finance/bilan/actif.phtml delete mode 100644 library/Scores/Partner/Templates/indiscore3/finance/bilan/passif.phtml delete mode 100644 library/Scores/Partner/Templates/indiscore3/finance/bilan/sig.phtml diff --git a/application/controllers/ReportController.php b/application/controllers/ReportController.php index 1516908..1b7eefb 100644 --- a/application/controllers/ReportController.php +++ b/application/controllers/ReportController.php @@ -100,20 +100,18 @@ class ReportController extends Zend_Controller_Action //Write the state to the session $cmdState = 2; - if ( Zend_Session::namespaceIsset('Cmd') ) { - $session = new Zend_Session_Namespace('Cmd'); - if ( $session->state > $cmdState ) { - $this->redirect($url); - } else { - $session->state = $cmdState; - } - } else { + $session = new Zend_Session_Namespace('Cmd'); + if ( $session->state > $cmdState ) { $this->redirect($url); + } else { + $session->state = $cmdState; } $values = $request->getPost(); $form->populate($values); + $this->view->CmdID = $session->CmdID; + if ( $form->isValid($values) ) { //Sauvegarde des informations @@ -193,17 +191,13 @@ class ReportController extends Zend_Controller_Action //Write the state to the session $cmdState = 3; - if ( Zend_Session::namespaceIsset('Cmd') ) { - $session = new Zend_Session_Namespace('Cmd'); - if ( $session->state > $cmdState || $session->CmdID != $cmdId ) { - $this->redirect($url); - } else { - $session->state = $cmdState; - } - } else { - $this->redirect($url); - } + $session = new Zend_Session_Namespace('Cmd'); + if ( $session->state > $cmdState || $session->CmdID != $cmdId ) { + $this->redirect($url); + } else { + $session->state = $cmdState; + } //Est ce que la commande existe $commandM = new Application_Model_Command(); diff --git a/application/views/scripts/report/index.phtml b/application/views/scripts/report/index.phtml index dc7d2a4..59bb578 100644 --- a/application/views/scripts/report/index.phtml +++ b/application/views/scripts/report/index.phtml @@ -47,17 +47,17 @@
  • - NbLiens?> + NbLiens == 0) ? 'Néant': 'Inclus';?> Liens inter-entreprises
  • - NbAnnonces?> + NbAnnonces == 0) ? 'Néant': 'Inclus';?> Annonces légales
  • - NbBilans?> + NbBilans == 0 ) ? 'Néant': 'Inclus';?> Bilans, ratios et SIG
  • diff --git a/library/Scores/Partner/Templates/indiscore3/bilans.phtml b/library/Scores/Partner/Templates/indiscore3/bilans.phtml index 043db03..1fb145e 100644 --- a/library/Scores/Partner/Templates/indiscore3/bilans.phtml +++ b/library/Scores/Partner/Templates/indiscore3/bilans.phtml @@ -1,5 +1,5 @@

    ÉLÉMENTS FINANCIERS - BILANS

    -typeBilan == 'B' and $this->typeBilan == 'A'):?> +typeBilan == 'B' and $this->typeBilan == 'A') {?>
    @@ -10,9 +10,9 @@
    - + - nbBilanN==0 && $this->nbBilanN==0):?> + nbBilanN!=0 || $this->nbBilanC!=0) {?>
    @@ -23,15 +23,98 @@
    - +

    Bilan actif - passif

    - partial('finance/bilan/actif.phtml')?> - partial('finance/bilan/passif.phtml')?> +
    + + + + + tabResultActif as $info) { ?> + + + + + + + + tabRatioActif as $idRatio => $info) { ?> + > + + tabResultActif as $value) { ?> + + + + + + +
    Actif +
    +
    % T.B.
    +
    +
    + +
    + + + + + tabResultPassif as $info) { ?> + + + + + + + tabRatioPassif as $idRatio => $info) { ?> + > + + tabResultPassif as $value) { ?> + + + + + + +
    Passif +
    +
    % T.B.
    +
    +

    Soldes Intermédiaire de Gestion

    - partial('finance/bilan/sig.phtml')?> +
    + + + + + tabResultSig as $info) { ?> + + + + + + + tabRatioSig as $idRatio => $info) { ?> + > + + + + + + tabResultSig as $value) { ?> + + + + + + +
    SOLDES INTERMEDIAIRE DE GESTION +
    +
    % C.A.
    +
    - + - + diff --git a/library/Scores/Partner/Templates/indiscore3/finance/bilan/actif.phtml b/library/Scores/Partner/Templates/indiscore3/finance/bilan/actif.phtml deleted file mode 100644 index 0833677..0000000 --- a/library/Scores/Partner/Templates/indiscore3/finance/bilan/actif.phtml +++ /dev/null @@ -1,42 +0,0 @@ -partial()->view->tabResultActif; -$tabRatio = $this->partial()->view->tabRatioActif; -?> -
    - - - - - - - - - - - - - $info) { ?> -> - - - - - - - - -
    Actif -
    -
    % T.B.
    -
    -
    - -
    -action('bilangraph', 'finance', null, array( - 'type' => 'actif', - 'typeBilan' => $this->partial()->view->typeBilan, - 'dateCloture' => $this->partial()->view->lastDateCloture, - 'siret' => $this->partial()->view->siret, - 'id' => $this->partial()->view->id, -))?> -
    \ No newline at end of file diff --git a/library/Scores/Partner/Templates/indiscore3/finance/bilan/passif.phtml b/library/Scores/Partner/Templates/indiscore3/finance/bilan/passif.phtml deleted file mode 100644 index 1b998cd..0000000 --- a/library/Scores/Partner/Templates/indiscore3/finance/bilan/passif.phtml +++ /dev/null @@ -1,41 +0,0 @@ -partial()->view->tabResultPassif; -$tabRatio = $this->partial()->view->tabRatioPassif; -?> -
    - - - - - - - - - - - - $info) { ?> -> - - - - - - - - -
    Passif -
    -
    % T.B.
    -
    -
    - -
    -action('bilangraph', 'finance', null, array( - 'type' => 'passif', - 'typeBilan' => $this->partial()->view->typeBilan, - 'dateCloture' => $this->partial()->view->lastDateCloture, - 'siret' => $this->partial()->view->siret, - 'id' => $this->partial()->view->id, -))?> -
    \ No newline at end of file diff --git a/library/Scores/Partner/Templates/indiscore3/finance/bilan/sig.phtml b/library/Scores/Partner/Templates/indiscore3/finance/bilan/sig.phtml deleted file mode 100644 index 1f6fa6f..0000000 --- a/library/Scores/Partner/Templates/indiscore3/finance/bilan/sig.phtml +++ /dev/null @@ -1,44 +0,0 @@ -partial()->view->tabResultSig; -$tabRatio = $this->partial()->view->tabRatioSig; -?> -
    - - - - - - - - - - - - $info) { ?> -> - - - - - - - - - - - - -
    SOLDES INTERMEDIAIRE DE GESTION -
    -
    % C.A.
    -
    - -
    -action('bilangraph', 'finance', null, array( - 'type' => 'sig', - 'typeBilan' => $this->partial()->view->typeBilan, - 'dateCloture' => $this->partial()->view->lastDateCloture, - 'siret' => $this->partial()->view->siret, - 'id' => $this->partial()->view->id, -))?> -
    \ No newline at end of file diff --git a/scripts/build/configure.php b/scripts/build/configure.php index 6ce7982..7e44e8b 100644 --- a/scripts/build/configure.php +++ b/scripts/build/configure.php @@ -40,7 +40,6 @@ try { //Options array( 'help|?' => "Affiche les informations d'utilisation", - 'check' => "Vérifie la configuration suivant le fichier de config installé", 'install' => "Installe et configure", ) );