[Noalyss-commit] [noalyss] 03/04: Enlève obsolete

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit d183eb59a693b6cfdcc00c68dd6e4453931babe1
Author: Dany De Bontridder <address@hidden>
Date:   Sun May 24 20:02:01 2015 +0200

    Enlève obsolete
---
 html/recherche.php        |    1 -
 include/action.inc.php    |    2 --
 include/adm.inc.php       |    3 ---
 include/bank.inc.php      |    1 -
 include/class_iaction.php |    2 +-
 include/class_ipopup.php  |    9 ++++-----
 sql/upgrade.sql           |   21 ++++++++++++++++-----
 7 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/html/recherche.php b/html/recherche.php
index 3590dda..d6e5b65 100644
--- a/html/recherche.php
+++ b/html/recherche.php
@@ -25,7 +25,6 @@ require_once('class_dossier.php');
 include_once("ac_common.php");
 include_once ("constant.php");
 require_once('class_acc_ledger.php');
-require_once('class_ipopup.php');
 html_page_start($_SESSION['g_theme']);
 
 load_all_script();
diff --git a/include/action.inc.php b/include/action.inc.php
index 51838eb..cdaa718 100644
--- a/include/action.inc.php
+++ b/include/action.inc.php
@@ -21,7 +21,6 @@
  * \brief Page who manage the different actions (meeting, letter)
  */
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
-require_once('class_ipopup.php');
 global $g_user;
 $retour=HtmlInput::button_anchor(_('Retour liste'),
        
HtmlInput::request_to_string(array("closed_action","remind_date_end","remind_date","sag_ref","only_internal","state","ac","gDossier","qcode","ag_dest_query","action_query","tdoc","date_start","date_end","hsstate","searchtag")),
@@ -34,7 +33,6 @@ require_once("class_ispan.php");
 require_once("class_ifile.php");
 require_once("class_itext.php");
 require_once("class_follow_up.php");
-require_once('class_iaction.php');
 /*!\brief Show the list of action, this code should be common
  *        to several webpage. But for the moment we keep like that
  *        because it is used only by this file.
diff --git a/include/adm.inc.php b/include/adm.inc.php
index f3cadd1..77a9697 100644
--- a/include/adm.inc.php
+++ b/include/adm.inc.php
@@ -25,11 +25,8 @@ require_once("class_iselect.php");
 require_once("class_ihidden.php");
 require_once("class_customer.php");
 require_once("class_ibutton.php");
-require_once('class_iaction.php');
 require_once('class_fiche_def.php');
-require_once('class_iaction.php');
 require_once('class_fiche_def.php');
-require_once('class_ipopup.php');
 require_once('class_admin.php');
 
 global $g_user;
diff --git a/include/bank.inc.php b/include/bank.inc.php
index 8ee6563..d199762 100644
--- a/include/bank.inc.php
+++ b/include/bank.inc.php
@@ -25,7 +25,6 @@ require_once("class_iselect.php");
 require_once("class_ihidden.php");
 require_once("class_bank.php");
 require_once("class_ibutton.php");
-require_once('class_iaction.php');
 global $g_user;
 
 $low_action=(isset($_REQUEST['sb']))?$_REQUEST['sb']:"list";
diff --git a/include/class_iaction.php b/include/class_iaction.php
index c7ad62b..c3324f1 100644
--- a/include/class_iaction.php
+++ b/include/class_iaction.php
@@ -25,7 +25,7 @@
  * value must be empty
  */
 require_once('class_html_input.php');
-class IAction extends HtmlInput
+class IAction_deprecated extends HtmlInput
 {
     /*!\brief show the html  input of the widget*/
     public function input($p_name="",$p_value="")
diff --git a/include/class_ipopup.php b/include/class_ipopup.php
index 565a933..652b1df 100644
--- a/include/class_ipopup.php
+++ b/include/class_ipopup.php
@@ -120,10 +120,10 @@ class IPopup extends HtmlInput
                         $this->name);
         }
         $r.='<div 
style="position:absolute;top:0px;right:10px;font-weight:normal;font-size:9px;color:black;text-align:right">';
-        $r.=sprintf('<a 
style="background-color:blue;color:white;text-decoration:none" 
href="%s">'._('Fermer').'</a></div>',
+        $r.=sprintf('<a 
style="background-color:blue;color:white;text-decoration:none" 
href="%s">&#10761;</a></div>',
                     $javascript);
 
-        $r.=sprintf('<div id ="%s_content" id="%s_content" 
class="popup_content"> %s </div></div>',
+        $r.=sprintf('<div id ="%s_content" id="%s_content" class="inner_box"> 
%s </div></div>',
                     $this->name,
                     $this->name,
                     $this->value);
@@ -157,13 +157,12 @@ class IPopup extends HtmlInput
 
     static function test_me()
     {
-        echo js_include('js/scripts.js');
         require_once('class_iselect.php');
         $select=new ISelect('a');
         $select->value=array(array ('value'=>0,'label'=>'Première valeur'),
                              array ('value'=>0,'label'=>'Première valeur'),
                              array ('value'=>0,'label'=>'Première valeur'));
-        for ($e=0;$e<50;$e++)
+        for ($e=0;$e<5;$e++)
         {
             echo $select->input();
             if ($e%10 == 0 ) echo '<hr>';
@@ -178,7 +177,7 @@ class IPopup extends HtmlInput
         echo '
         <input type="button" onclick="hide(\'pop1\');hide(\'pop1_border\')" 
value="cacher">
                                      <input type="button" 
onclick="showIPopup(\'pop1\')" value="montrer">
-              ',
+              ';
         $a=new IPopup('pop2');
         $a->value='';
         $a->title="Retrouvez une saucisse";
diff --git a/sql/upgrade.sql b/sql/upgrade.sql
index e438d64..28dba84 100644
--- a/sql/upgrade.sql
+++ b/sql/upgrade.sql
@@ -1,12 +1,18 @@
-INSERT INTO action(
-            ac_id, ac_description, ac_module, ac_code)
+ALTER TABLE action    ALTER COLUMN ac_code TYPE character varying(30);
+
+INSERT INTO action(ac_id, ac_description, ac_module, ac_code)
     VALUES (1110, 'Enlever une pièce justificative', 'compta', 'RMRECEIPT');
-INSERT INTO action(
-            ac_id, ac_description, ac_module, ac_code)
+INSERT INTO action(ac_id, ac_description, ac_module, ac_code)
     VALUES (1120, 'Effacer une opération ', 'compta', 'RMOPER');
+INSERT INTO action(ac_id, ac_description, ac_module, ac_code)
+    VALUES (1210, 'Partager une note', 'note', 'SHARENOTE');
+INSERT INTO action(ac_id, ac_description, ac_module, ac_code)
+    VALUES (1220, 'Partager une note avec tout le monde ', 'note', 
'SHARENOTEPUBLIC');
+INSERT INTO action(ac_id, ac_description, ac_module, ac_code)
+    VALUES (1230, 'Effacer une note publique', 'note', 'SHARENOTEREMOVE');
 
 
-CREATE TABLE todo_list_shared (id  serial primary key, todo_list_id int4 NOT 
NULL, use_login int4 NOT NULL, CONSTRAINT unique_todo_list_id_login 
+CREATE TABLE todo_list_shared (id  serial primary key, todo_list_id int4 NOT 
NULL, use_login text NOT NULL, CONSTRAINT unique_todo_list_id_login 
     UNIQUE (todo_list_id, use_login));
 
 ALTER TABLE todo_list_shared ADD CONSTRAINT fk_todo_list_shared_todo_list 
FOREIGN KEY (todo_list_id) REFERENCES todo_list (tl_id);
@@ -15,6 +21,11 @@ comment on table todo_list_shared is 'Note of todo list 
shared with other users'
 comment on column todo_list_shared.todo_list_id is 'fk to todo_list';
 comment on column todo_list_shared.use_login is 'user login';
 
+alter table todo_list add is_public char(1) default 'N';
+comment on column todo_list.is_public is 'Flag for the public parameter';
+ALTER TABLE todo_list    ALTER COLUMN is_public SET NOT NULL;
+
+ALTER TABLE todo_list ADD CONSTRAINT ck_is_public CHECK (is_public in 
('Y','N'));
 
 /**
 Arbre dépendance