Updated things I thought where already done.

diff --git a/app/compta/page_ledger_mes_documents.php b/app/compta/page_ledger_mes_documents.php
index 6c5ed07a25587b1a0fecc5e00d171cf45d43f772..9a64e91c2c825a3352d550445f9b2cd506cd00e0 100644 (file)
--- a/app/compta/page_ledger_mes_documents.php
+++ b/app/compta/page_ledger_mes_documents.php
@@ -2,6 +2,7 @@
 require_once(dirname(__FILE__)."/pages.php");
 require_once(dirname(__FILE__)."/api_exercice.php");
 require_once(dirname(__FILE__)."/api_syndic.php");
+require_once(dirname(__FILE__)."/api_retrieve.php");
 
 $XmlComptaDocuments =  <<<XML
 <?xml version="1.0" encoding="ISO-8859-1"?>
@@ -44,30 +45,38 @@ class PageMesDocuments extends PageCompta {
   function __construct($s,$b)
   {
         parent::__construct($s,$b);
+        GLOBAL $conf;
+        $this->conf_auth = $conf['auth']['mysql'];
+        $this->_retrieve = new \Retrieve( $this->session
+             , $this->conf_auth
+             , $this->session->getDb());
   }
 
-  private function decompte($period)
+  private function decompte($period,$cpt)
   {
     $_scheme = $this->request->getScheme();
-    $root    = $_scheme."".$this->request->getServerHost()."/".$this->alias."/app/compta/reports/decompte_charge.php?period=";
-    echo '<li><a href="'.$root.$period.'&compte=400004">Décompte de charge '.$period.'</a></li>';
+    $root    = $_scheme."".$this->request->getServerHost()."/".$this->alias."/app/compta/reports/syndic_builder_decompte.php?period=";
+    echo '<li><a href="'.$root.$period.'&compte='.$cpt.'">Décompte de charge '.$period.'</a></li>';
   }
   private function documents()
   {
-    $_cfg = $this->_auth_cfg;
-    $ex = new Exercice( $this->getSession()
+      $_cfg = $this->_auth_cfg;
+      $ex = new Exercice( $this->getSession()
              , $_cfg
             , $this->getSession()->getDb());
-    $syndic = new Syndic( $this->getSession()
+      $syndic = new Syndic( $this->getSession()
              , $_cfg
             , $this->getSession()->getDb());
-    $acc = $syndic->getCoproprietaires(0);
-    $p = $ex->getClosed(false);
-    echo "<ul>";
-    foreach ($p as $doc)
-    {
-      $this->decompte($doc[3]);
-    } 
+      $retrieve = $this->_retrieve;
+      $res      = $retrieve->getSoldeCharge();
+      $compte   = $retrieve->getAccount($this->session->id());
+      $acc = $syndic->getCoproprietaires(0);
+      $p = $ex->getClosed(false);
+      echo "<ul>";
+      foreach ($p as $doc)
+      {
+          $this->decompte($doc[3],$compte[0]);
+      } 
     echo "</ul>";
   }
 
@@ -77,7 +86,7 @@ class PageMesDocuments extends PageCompta {
    */
   function main() {
       echo '<div class="content" style="display:flex;flex-wrap:wrap">';
-      echo "<h3 width='100%'>Vos décomptes de charge</h3>";
+      echo "<h3 class='h3'>Vos décomptes de charge</h3>";
       $this->documents();
       echo '</div>';
   }

diff --git a/app/compta/reports/syndic_annexe1.php b/app/compta/reports/syndic_annexe1.php
index 15ffedb19b9cbddeee6360af336cd15df0665111..fb4d50ab9f87fb70e54c2e1dcac253ea12f350bc 100644 (file)
--- a/app/compta/reports/syndic_annexe1.php
+++ b/app/compta/reports/syndic_annexe1.php
@@ -1,8 +1,8 @@
 <?php
 require_once(dirname(__FILE__)."/../../common.php");
 require_once(dirname(__FILE__)."/syndic_annexe_data.php");
-require_once(dirname(__FILE__).'/../../../phplib/tcpdf/config/lang/eng.php');
-require_once(dirname(__FILE__).'/../../../phplib/tcpdf/tcpdf.php');
+require_once(dirname(__FILE__).'/../../../tiers/tcpdf/config/lang/eng.php');
+require_once(dirname(__FILE__).'/../../../tiers/tcpdf/tcpdf.php');
 
 /**
  * \brief Syndic Annexe 1.

diff --git a/app/compta/reports/syndic_annexe2.php b/app/compta/reports/syndic_annexe2.php
index fa970bdb66aed17b39c76872a393580e0fe67e80..53bda664ff2783bc56b619d222e9fc66eef61d49 100644 (file)
--- a/app/compta/reports/syndic_annexe2.php
+++ b/app/compta/reports/syndic_annexe2.php
@@ -1,8 +1,8 @@
 <?php
 require_once(dirname(__FILE__)."/../../common.php");
 require_once(dirname(__FILE__)."/syndic_annexe_data.php");
-require_once(dirname(__FILE__).'/../../../phplib/tcpdf/config/lang/eng.php');
-require_once(dirname(__FILE__).'/../../../phplib/tcpdf/tcpdf.php');
+require_once(dirname(__FILE__).'/../../../tiers/tcpdf/config/lang/eng.php');
+require_once(dirname(__FILE__).'/../../../tiers/tcpdf/tcpdf.php');
 
 /**
  * \brief Syndic Annexe 1.

diff --git a/app/compta/reports/syndic_annexe3.php b/app/compta/reports/syndic_annexe3.php
index 964b19bce60e37fbe7d96db1d89be4b1ba971ff7..873b875e0e453c8e152a012cc0205916b3bea0c7 100644 (file)
--- a/app/compta/reports/syndic_annexe3.php
+++ b/app/compta/reports/syndic_annexe3.php
@@ -2,8 +2,8 @@
 require_once(dirname(__FILE__)."/../../common.php");
 require_once(dirname(__FILE__)."/../session.php");
 require_once(dirname(__FILE__)."/../../../phplib/class.db.php");
-require_once(dirname(__FILE__).'/../../../phplib/tcpdf/config/lang/eng.php');
-require_once(dirname(__FILE__).'/../../../phplib/tcpdf/tcpdf.php');
+require_once(dirname(__FILE__).'/../../../tiers/tcpdf/config/lang/eng.php');
+require_once(dirname(__FILE__).'/../../../tiers/tcpdf/tcpdf.php');
 
 
 class annexe3  {

diff --git a/app/compta/reports/syndic_annexe4.php b/app/compta/reports/syndic_annexe4.php
index b37c9a82b7aa8fee160afdd66afe03b84172cb8d..82d2c9e2f6d1520c55b49039796ff66a60f0432b 100644 (file)
--- a/app/compta/reports/syndic_annexe4.php
+++ b/app/compta/reports/syndic_annexe4.php
@@ -2,8 +2,8 @@
 require_once(dirname(__FILE__)."/../../common.php");
 require_once(dirname(__FILE__)."/../session.php");
 require_once(dirname(__FILE__)."/../../../phplib/class.db.php");
-require_once(dirname(__FILE__).'/../../../phplib/tcpdf/config/lang/eng.php');
-require_once(dirname(__FILE__).'/../../../phplib/tcpdf/tcpdf.php');
+require_once(dirname(__FILE__).'/../../../tiers/tcpdf/config/lang/eng.php');
+require_once(dirname(__FILE__).'/../../../tiers/tcpdf/tcpdf.php');
 
 
 class annexe4  {

diff --git a/app/compta/reports/syndic_annexe_data.php b/app/compta/reports/syndic_annexe_data.php
index 7f10513e1dc8b76962794ae525c94b2eafad195d..c58e262cbc314d8d7dc1e156d0c939b345948b5c 100644 (file)
--- a/app/compta/reports/syndic_annexe_data.php
+++ b/app/compta/reports/syndic_annexe_data.php
@@ -2,8 +2,8 @@
 require_once(dirname(__FILE__)."/../../common.php");
 require_once(dirname(__FILE__)."/../session.php");
 require_once(dirname(__FILE__)."/../../../phplib/class.db.php");
-require_once(dirname(__FILE__).'/../../../phplib/tcpdf/config/lang/eng.php');
-require_once(dirname(__FILE__).'/../../../phplib/tcpdf/tcpdf.php');
+require_once(dirname(__FILE__).'/../../../tiers/tcpdf/config/lang/eng.php');
+require_once(dirname(__FILE__).'/../../../tiers/tcpdf/tcpdf.php');
 
 
 /**

diff --git a/app/compta/reports/syndic_builder_annexe.php b/app/compta/reports/syndic_builder_annexe.php
index 54aaf05181f1490014877ae89c5b5350df4b489f..74d5908f62ba042313055a7f63cebe3260b68c2a 100644 (file)
--- a/app/compta/reports/syndic_builder_annexe.php
+++ b/app/compta/reports/syndic_builder_annexe.php
@@ -2,8 +2,8 @@
 require_once(dirname(__FILE__)."/../../common.php");
 require_once(dirname(__FILE__)."/../session.php");
 require_once(dirname(__FILE__)."/../../../phplib/class.db.php");
-require_once(dirname(__FILE__).'/../../../phplib/tcpdf/config/lang/eng.php');
-require_once(dirname(__FILE__).'/../../../phplib/tcpdf/tcpdf.php');
+require_once(dirname(__FILE__).'/../../../tiers/tcpdf/config/lang/eng.php');
+require_once(dirname(__FILE__).'/../../../tiers/tcpdf/tcpdf.php');
 require_once(dirname(__FILE__).'/syndic_annexe_data.php');
 require_once(dirname(__FILE__).'/syndic_annexe4.php');
 require_once(dirname(__FILE__).'/syndic_annexe1.php');

diff --git a/app/compta/reports/syndic_builder_decompte.php b/app/compta/reports/syndic_builder_decompte.php
index a81bde07cb70e0781cfd180a36415700f32cf83f..803dcd11033ad9971c2ba5930bdc11aab4a887fe 100644 (file)
--- a/app/compta/reports/syndic_builder_decompte.php
+++ b/app/compta/reports/syndic_builder_decompte.php
@@ -2,8 +2,8 @@
 require_once(dirname(__FILE__)."/../../common.php");
 require_once(dirname(__FILE__)."/../session.php");
 require_once(dirname(__FILE__)."/../../../phplib/class.db.php");
-require_once(dirname(__FILE__).'/../../../phplib/tcpdf/config/lang/eng.php');
-require_once(dirname(__FILE__).'/../../../phplib/tcpdf/tcpdf.php');
+require_once(dirname(__FILE__).'/../../../tiers/tcpdf/config/lang/eng.php');
+require_once(dirname(__FILE__).'/../../../tiers/tcpdf/tcpdf.php');
 require_once(dirname(__FILE__).'/syndic_annexe_data.php');
 require_once(dirname(__FILE__).'/syndic_compte.php');
 require_once(dirname(__FILE__).'/syndic_charges.php');

diff --git a/app/compta/reports/syndic_charges.php b/app/compta/reports/syndic_charges.php
index 15aa45f481f5c13b5c42bc19d99b4e3b256b1796..a958ec5cb600b3d35a9ffc152f2ea0f1a69184f8 100644 (file)
--- a/app/compta/reports/syndic_charges.php
+++ b/app/compta/reports/syndic_charges.php
@@ -4,7 +4,6 @@
 require_once(dirname(__FILE__)."/../../common.php");
 require_once(dirname(__FILE__)."/../session.php");
 require_once(dirname(__FILE__)."/../api_retrieve.php");
-require_once(dirname(__FILE__)."/../../../phplib/class.fpdfdb.php");
 require_once(dirname(__FILE__)."/../../../phplib/class.session.php");
 
 

diff --git a/app/compta/reports/syndic_compte.php b/app/compta/reports/syndic_compte.php
index 662f655f391be71452cb19c9cc5dc14cdbf2cf72..db14d2db4c6fa3bacc230d04562f4b878311f1bf 100644 (file)
--- a/app/compta/reports/syndic_compte.php
+++ b/app/compta/reports/syndic_compte.php
@@ -5,8 +5,8 @@ require_once(dirname(__FILE__)."/../../common.php");
 require_once(dirname(__FILE__)."/../../../phplib/class.session.php");
 require_once(dirname(__FILE__)."/../session.php");
 require_once(dirname(__FILE__)."/../api_retrieve.php");
-require_once(dirname(__FILE__).'/../../../phplib/tcpdf/config/lang/eng.php');
-require_once(dirname(__FILE__).'/../../../phplib/tcpdf/tcpdf.php');
+require_once(dirname(__FILE__).'/../../../tiers/tcpdf/config/lang/eng.php');
+require_once(dirname(__FILE__).'/../../../tiers/tcpdf/tcpdf.php');
 
 
 /**

diff --git a/app/compta/views/compta_index.php b/app/compta/views/compta_index.php
index 1886e9690c89e491240bf326e913d908cb8adc4a..742577f5cd26758524fada64781e9d8d3b67a399 100644 (file)
--- a/app/compta/views/compta_index.php
+++ b/app/compta/views/compta_index.php
@@ -206,7 +206,7 @@ __EOF;
         $_content =<<<_EOF
 Les charges latentes: <em>{$res[1]} €</em><br/>
 Le solde du compte : <br/>
-<a href="reports/syndic_builder_decompte.php?period={$this->session->getCurrentExercice()}&compte={$compte[0]}"><i class="fa fa-file-pdf"></i>Télécharger</a>
+<a href="/app/compta/reports/syndic_builder_decompte.php?period={$this->session->getCurrentExercice()}&compte={$compte[0]}"><i class="fa fa-file-pdf"></i>Télécharger</a>
 _EOF;
         $this->article($title,"iu-coproprietaire.jpg",$_content);
     }

diff --git a/app/config/mysql.conf.php b/app/config/mysql.conf.php
new file mode 120000 (symlink)
index 0000000..17af80e
--- /dev/null
+++ b/app/config/mysql.conf.php
@@ -0,0 +1 @@
+mysql.conf.php.home
\ No newline at end of file

diff --git a/app/config/mysql.conf.php.home b/app/config/mysql.conf.php.home
index ee8e6bfaab3c9a957989af10d2590b5d96d257ae..ca40c9d321b2ea10d9201715c4abdcd7d155ebd7 100644 (file)
--- a/app/config/mysql.conf.php.home
+++ b/app/config/mysql.conf.php.home
@@ -15,8 +15,14 @@ $conf['auth']['mysql'][SQL_DB]               = 'users';
 //$conf['auth']['mysql']['req_file']   = dirname(__FILE__).'/../member/sql-andre-requests.xml';\r
 $conf['auth']['mysql']['req_file']     = '/sql-andre-requests.xml';\r
 \r
+$conf['datadir'] = '/var/www/data-gcopro/';\r
+$conf['log']['dir'] = '/var/www/data-gcopro/';\r
+$conf['log']['level'] = 'INFO';\r
+\r
 $conf['langues'][] = 'fr';\r
 \r
+\r
+\r
 $conf['auth']['mysql']["Init"] = "CREATE TABLE IF NOT EXISTS users (\r
        uid INT  AUTO_INCREMENT ,\r
        firstname       VARCHAR(32),\r

diff --git a/app/config/syndic.php b/app/config/syndic.php
index 7450e74215550f01493a0e1ab7c66f53136bf432..7ecd64a27920ac8aecd0f196b31287aa4b90593b 100644 (file)
--- a/app/config/syndic.php
+++ b/app/config/syndic.php
@@ -18,55 +18,8 @@ if (!defined('SL_COPROPRIETAIRE'))  define('SL_COPROPRIETAITE',3);
 if (!defined('SL_LOCATAIRE'))       define('SL_LOCATAIRE',2);
 if (!defined('SL_AUHENTICATED'))    define('SL_AUTHENTICATED',1);
 if (!defined('SL_ANONYMOUS'))       define('SL_ANONYMOUS',0);
-/**
- *
- */
-class inputRow {
-  var $_input;
-  function __construct($inp) {
-    $this->_input = $inp;
-  }
-  function show() {
-    echo "<p class='form-row'>";
-    $this->_input->show();
-    echo "</p>\n";
-  }
-}
 
-/**
- * @brief Remove completely in the long run.
- * I don't want built in pop up for login
- */
-class loginLayoutTrinity {
-    function __construct () {
-    }
 
-    function show() {
-       global $conf;
-       $f = new Form("member/login.php");
-       $f->id="generic_login_form"; 
-       $s = 19;
-       $w = new FormInputPassword("passwd","",_("password : "));
-       $w->setSize($s,1);
-       $ir = new inputRow($w);
-       $f->addInput($ir);
-       $w= new FormInput("action","LOGIN_REQUEST","");
-       $f->addInput($w);
-       $w= new FormInputSubmit("submit","Login","");
-       $w->onClick = "doLoginRequest(); return false;";
-       $ir = new inputRow($w);
-       $f->addInput($ir);
-       $w= new FormInputSubmit("button","Cancel","");
-       $w->onClick = "hideLogin(); return false;";
-       $ir = new inputRow($w);
-       $f->addInput($ir);
-       //echo "<br>";
-       echo "<div id='generic_login_div' class='hidden'>";
-       echo "<p id='generic_login_response'></p>";
-       $f->show();
-       echo "</div>";
-    }
-}
 /**
  * @brief 
  *
@@ -74,7 +27,7 @@ class loginLayoutTrinity {
 class AppPage extends Page {
     protected $_auth_cfg;
     protected $request    = null;
-    private   $reload_css = "?res=14"; // set to ?res=1 in order to 
+    private   $reload_css = "?res=15"; // set to ?res=1 in order to 
     var $alias      = "/andre/";
     var $topic;
     var $session   = null;
@@ -83,7 +36,7 @@ class AppPage extends Page {
     var $lang      = "fr_FR.UTF-8";
     var $is_logged = false;
     var $with_prototype     = true;
-    var $with_scriptacoulus = true;
+    var $with_scriptacoulus = false;
     var $with_mymenu        = true;
     var $with_aebw          = true;
     var $with_xgui          = true;
@@ -140,17 +93,15 @@ FIN;
             echo "<script type='text/javascript' src='".$this->alias."/js/scriptaculus/scriptaculous.js' ></script>\n";
             echo "<script type='text/javascript' src='".$this->alias."/js/scriptaculus/effects.js' ></script>\n";
         }
-            if ($this->with_xgui) {
+        if ($this->with_xgui) {
             echo "<script type='text/javascript' src='".$this->alias."/css/jscook/JSCookTree.js' ></script>\n";
             echo "<script type='text/javascript' src='".$this->alias."/css/jscook/theme.js' ></script>\n";
         }
         echo "<script type='text/javascript' src='".$this->alias."/js/mymenu.js' ></script>\n";
         echo "<script type='text/javascript' src='".$this->alias."/js/xgui/aebw.js' ></script>\n";
-        //echo "<script type='text/javascript' src='".$this->alias."/js/webcomponentsjs/webcomponents-bundle.js' ></script>\n";
-        //echo "<script type='text/javascript' src='".$this->alias."/js/webcomponentsjs/custom-elements-es5-adapter.js' ></script>\n";
         if ($this->with_login) {
             echo "<script type='text/javascript' src='".$this->alias."/js/md5.js' ></script>\n";
-            echo "<script type='text/javascript' src='".$this->alias."/js/login.js' ></script>\n";
+            echo "<script type='text/javascript' src='".$this->alias."/js/login.js?r' ></script>\n";
         }
         echo "<!-- BEFORE With Syntax -->\n";
         if ($this->with_syntax) {
@@ -354,8 +305,6 @@ END;
      *
      */
     function _login () {
-        //$l = new loginLayoutTrinity();
-        //$l->show();
     }
 
     /**

diff --git a/js/login.js b/js/login.js
index 60ce2ce83446cb369c3771fd8695ee62124713f2..424b03358ab8e21f4e6d1cb49d01989d8bfea513 100644 (file)
--- a/js/login.js
+++ b/js/login.js
@@ -404,14 +404,15 @@ function showLoginWithRedirect(redirect) {
  */
 function doLogoutRequest() 
 {
+  /*
   var form =$('generic_login_form');
   $("action").setValue("LOGOUT_REQUEST");
   var str=form.serialize();
-
-  new Ajax.Request(alias+'/app/member/login.php',
-      {
-        method: 'post',
         postBody:  str,
+  */
+  new Ajax.Request(alias+'/app/member/logout.php',
+      {
+        method: 'get',
         onFailure: function () {
           alert("Failed Request");
         },