[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 13/29: Balise Document_Type
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 13/29: Balise Document_Type |
Date: |
Wed, 4 Nov 2020 11:08:41 -0500 (EST) |
sparkyx pushed a commit to branch master
in repository noalyss.
commit 47d9a08595ac66db1ae543d2d4b93d5bcb650c22
Author: sparkyx <danydb@noalyss.eu>
AuthorDate: Sat Oct 31 00:32:24 2020 +0100
Balise Document_Type
---
include/class/document.class.php | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/include/class/document.class.php b/include/class/document.class.php
index 1f9ed75..64641f8 100644
--- a/include/class/document.class.php
+++ b/include/class/document.class.php
@@ -554,7 +554,7 @@ class Document
$p_tag=str_replace('=','',$p_tag);
$r="Tag inconnu";
static $aComment=NULL;
- static $counter_comment =0 ; /*<! counter for the comment */
+ static $counter_comment =1 ; /*<! counter for the comment , skip the
first one which is the descrition*/
static $aRelatedAction=NULL;
static $counter_related_action =0 ; /*<! counter for the related
action */
@@ -1246,6 +1246,7 @@ class Document
$followup=new Follow_Up($this->db,$p_array["ag_id"]);
$aRelatedAction=array();
$aParent=$followup->get_parent();
+ if ($aParent == -1 )return "";
$nb_parent=count($aParent);
$sql_related_action = "
select ag_id,
@@ -1434,6 +1435,16 @@ class Document
return $status;
}
return "";
+ // type of document
+ case 'DOCUMENT_TYPE':
+ $ret="";
+ if ( isset($p_array['ag_id'])){
+ $ret=$this->db->get_value("select dt_value
+ from action_gestion
+ join document_type dt on
(ag_type=dt.dt_id)
+ where ag_id=$1",array($p_array["ag_id"]));
+ }
+ return $ret;
} // end switch
- [Noalyss-commit] [noalyss] branch master updated (bc168d2 -> fdf9df4), Dany De Bontridder, 2020/11/04
- [Noalyss-commit] [noalyss] 01/29: Nouvelle balises, Dany De Bontridder, 2020/11/04
- [Noalyss-commit] [noalyss] 03/29: FollowUp : nouvelle balises HOUR , GROUPMGMT , PRIORITY, Dany De Bontridder, 2020/11/04
- [Noalyss-commit] [noalyss] 13/29: Balise Document_Type,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 06/29: Compta analytique : ajout du tiers dans Grand'Livre, Dany De Bontridder, 2020/11/04
- [Noalyss-commit] [noalyss] 10/29: Correct SQL script, Dany De Bontridder, 2020/11/04
- [Noalyss-commit] [noalyss] 16/29: Security Can_Request log the security for Ajax, Dany De Bontridder, 2020/11/04
- [Noalyss-commit] [noalyss] 05/29: Balise : nouveau STATUS , etat du document, Dany De Bontridder, 2020/11/04
- [Noalyss-commit] [noalyss] 11/29: Style : improve h2, Dany De Bontridder, 2020/11/04
- [Noalyss-commit] [noalyss] 22/29: Cosmetic, Dany De Bontridder, 2020/11/04
- [Noalyss-commit] [noalyss] 25/29: cosmetic : waiting box, Dany De Bontridder, 2020/11/04
- [Noalyss-commit] [noalyss] 19/29: Predefined Operation filter by ledger, Dany De Bontridder, 2020/11/04
- [Noalyss-commit] [noalyss] 21/29: cosmetic , remove myfiedset class, unclosed tag , the title comment is not show if there is no comment, Dany De Bontridder, 2020/11/04
- [Noalyss-commit] [noalyss] 20/29: Cosmetic Admin List Folders : add close button, Dany De Bontridder, 2020/11/04