Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dolibarr
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
a76594c2
Commit
a76594c2
authored
Mar 19, 2013
by
Philippe Grand
Browse files
Options
Downloads
Patches
Plain Diff
standardize and simplify code and enhance display
parent
5c87a4ff
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
htdocs/admin/fichinter.php
+71
-52
71 additions, 52 deletions
htdocs/admin/fichinter.php
with
71 additions
and
52 deletions
htdocs/admin/fichinter.php
+
71
−
52
View file @
a76594c2
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2008 Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
* Copyright (C) 2008 Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
* Copyright (C) 2011-2012 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2011-2012 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2011-201
2
Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2011-201
3
Philippe Grand <philippe.grand@atoo-net.com>
*
*
* This program is free software; you can redistribute it and/or modify
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* it under the terms of the GNU General Public License as published by
...
@@ -67,42 +67,7 @@ if ($action == 'updateMask')
...
@@ -67,42 +67,7 @@ if ($action == 'updateMask')
}
}
}
}
if
(
$action
==
'set_FICHINTER_FREE_TEXT'
)
else
if
(
$action
==
'specimen'
)
// For fiche inter
{
$freetext
=
GETPOST
(
'FICHINTER_FREE_TEXT'
,
'alpha'
);
$res
=
dolibarr_set_const
(
$db
,
"FICHINTER_FREE_TEXT"
,
$freetext
,
'chaine'
,
0
,
''
,
$conf
->
entity
);
if
(
!
$res
>
0
)
$error
++
;
if
(
!
$error
)
{
$mesg
=
"<font class=
\"
ok
\"
>"
.
$langs
->
trans
(
"SetupSaved"
)
.
"</font>"
;
}
else
{
$mesg
=
"<font class=
\"
error
\"
>"
.
$langs
->
trans
(
"Error"
)
.
"</font>"
;
}
}
if
(
$action
==
'set_FICHINTER_DRAFT_WATERMARK'
)
{
$draft
=
GETPOST
(
'FICHINTER_DRAFT_WATERMARK'
,
'alpha'
);
$res
=
dolibarr_set_const
(
$db
,
"FICHINTER_DRAFT_WATERMARK"
,
trim
(
$draft
),
'chaine'
,
0
,
''
,
$conf
->
entity
);
if
(
!
$res
>
0
)
$error
++
;
if
(
!
$error
)
{
$mesg
=
"<font class=
\"
ok
\"
>"
.
$langs
->
trans
(
"SetupSaved"
)
.
"</font>"
;
}
else
{
$mesg
=
"<font class=
\"
error
\"
>"
.
$langs
->
trans
(
"Error"
)
.
"</font>"
;
}
}
if
(
$action
==
'specimen'
)
{
{
$modele
=
GETPOST
(
'module'
,
'alpha'
);
$modele
=
GETPOST
(
'module'
,
'alpha'
);
...
@@ -147,12 +112,13 @@ if ($action == 'specimen')
...
@@ -147,12 +112,13 @@ if ($action == 'specimen')
}
}
}
}
if
(
$action
==
'set'
)
// Activate a model
else
if
(
$action
==
'set'
)
{
{
$ret
=
addDocumentModel
(
$value
,
$type
,
$label
,
$scandir
);
$ret
=
addDocumentModel
(
$value
,
$type
,
$label
,
$scandir
);
}
}
if
(
$action
==
'del'
)
else
if
(
$action
==
'del'
)
{
{
$ret
=
delDocumentModel
(
$value
,
$type
);
$ret
=
delDocumentModel
(
$value
,
$type
);
if
(
$ret
>
0
)
if
(
$ret
>
0
)
...
@@ -161,7 +127,8 @@ if ($action == 'del')
...
@@ -161,7 +127,8 @@ if ($action == 'del')
}
}
}
}
if
(
$action
==
'setdoc'
)
// Set default model
else
if
(
$action
==
'setdoc'
)
{
{
if
(
dolibarr_set_const
(
$db
,
"FICHEINTER_ADDON_PDF"
,
$value
,
'chaine'
,
0
,
''
,
$conf
->
entity
))
if
(
dolibarr_set_const
(
$db
,
"FICHEINTER_ADDON_PDF"
,
$value
,
'chaine'
,
0
,
''
,
$conf
->
entity
))
{
{
...
@@ -178,7 +145,7 @@ if ($action == 'setdoc')
...
@@ -178,7 +145,7 @@ if ($action == 'setdoc')
}
}
}
}
if
(
$action
==
'setmod'
)
else
if
(
$action
==
'setmod'
)
{
{
// TODO Verifier si module numerotation choisi peut etre active
// TODO Verifier si module numerotation choisi peut etre active
// par appel methode canBeActivated
// par appel methode canBeActivated
...
@@ -186,6 +153,41 @@ if ($action == 'setmod')
...
@@ -186,6 +153,41 @@ if ($action == 'setmod')
dolibarr_set_const
(
$db
,
"FICHEINTER_ADDON"
,
$value
,
'chaine'
,
0
,
''
,
$conf
->
entity
);
dolibarr_set_const
(
$db
,
"FICHEINTER_ADDON"
,
$value
,
'chaine'
,
0
,
''
,
$conf
->
entity
);
}
}
else
if
(
$action
==
'set_FICHINTER_FREE_TEXT'
)
{
$freetext
=
GETPOST
(
'FICHINTER_FREE_TEXT'
,
'alpha'
);
$res
=
dolibarr_set_const
(
$db
,
"FICHINTER_FREE_TEXT"
,
$freetext
,
'chaine'
,
0
,
''
,
$conf
->
entity
);
if
(
!
$res
>
0
)
$error
++
;
if
(
!
$error
)
{
$mesg
=
"<font class=
\"
ok
\"
>"
.
$langs
->
trans
(
"SetupSaved"
)
.
"</font>"
;
}
else
{
$mesg
=
"<font class=
\"
error
\"
>"
.
$langs
->
trans
(
"Error"
)
.
"</font>"
;
}
}
else
if
(
$action
==
'set_FICHINTER_DRAFT_WATERMARK'
)
{
$draft
=
GETPOST
(
'FICHINTER_DRAFT_WATERMARK'
,
'alpha'
);
$res
=
dolibarr_set_const
(
$db
,
"FICHINTER_DRAFT_WATERMARK"
,
trim
(
$draft
),
'chaine'
,
0
,
''
,
$conf
->
entity
);
if
(
!
$res
>
0
)
$error
++
;
if
(
!
$error
)
{
$mesg
=
"<font class=
\"
ok
\"
>"
.
$langs
->
trans
(
"SetupSaved"
)
.
"</font>"
;
}
else
{
$mesg
=
"<font class=
\"
error
\"
>"
.
$langs
->
trans
(
"Error"
)
.
"</font>"
;
}
}
/*
/*
* View
* View
...
@@ -202,6 +204,17 @@ print_fiche_titre($langs->trans("InterventionsSetup"),$linkback,'setup');
...
@@ -202,6 +204,17 @@ print_fiche_titre($langs->trans("InterventionsSetup"),$linkback,'setup');
print
"<br>"
;
print
"<br>"
;
$h
=
0
;
$head
[
$h
][
0
]
=
DOL_URL_ROOT
.
"/admin/fichinter.php"
;
$head
[
$h
][
1
]
=
$langs
->
trans
(
"Interventions"
);
$head
[
$h
][
2
]
=
'Ficheinter'
;
$hselected
=
$h
;
$h
++
;
dol_fiche_head
(
$head
,
$hselected
,
$langs
->
trans
(
"ModuleSetup"
));
// Interventions numbering model
print_titre
(
$langs
->
trans
(
"FicheinterNumberingModules"
));
print_titre
(
$langs
->
trans
(
"FicheinterNumberingModules"
));
...
@@ -234,22 +247,22 @@ foreach ($dirmodels as $reldir)
...
@@ -234,22 +247,22 @@ foreach ($dirmodels as $reldir)
$file
=
$reg
[
1
];
$file
=
$reg
[
1
];
$classname
=
substr
(
$file
,
4
);
$classname
=
substr
(
$file
,
4
);
require_once
DOL_DOCUMENT_ROOT
.
"/core/modules/fichinter/"
.
$file
.
'.php'
;
require_once
$dir
.
$file
.
'.php'
;
$module
=
new
$file
;
$module
=
new
$file
;
if
(
$module
->
isEnabled
())
{
// Show modules according to features level
// Show modules according to features level
if
(
$module
->
version
==
'development'
&&
$conf
->
global
->
MAIN_FEATURES_LEVEL
<
2
)
continue
;
if
(
$module
->
version
==
'development'
&&
$conf
->
global
->
MAIN_FEATURES_LEVEL
<
2
)
continue
;
if
(
$module
->
version
==
'experimental'
&&
$conf
->
global
->
MAIN_FEATURES_LEVEL
<
1
)
continue
;
if
(
$module
->
version
==
'experimental'
&&
$conf
->
global
->
MAIN_FEATURES_LEVEL
<
1
)
continue
;
if
(
$module
->
isEnabled
())
{
$var
=!
$var
;
$var
=!
$var
;
print
'<tr '
.
$bc
[
$var
]
.
'><td>'
.
$module
->
nom
.
"</td><td>
\n
"
;
print
'<tr '
.
$bc
[
$var
]
.
'><td>'
.
$module
->
nom
.
"</td><td>
\n
"
;
print
$module
->
info
();
print
$module
->
info
();
print
'</td>'
;
print
'</td>'
;
// Show example of numbering mod
ul
e
// Show example of numbering mode
l
print
'<td nowrap="nowrap">'
;
print
'<td nowrap="nowrap">'
;
$tmp
=
$module
->
getExample
();
$tmp
=
$module
->
getExample
();
if
(
preg_match
(
'/^Error/'
,
$tmp
))
print
'<div class="error">'
.
$langs
->
trans
(
$tmp
)
.
'</div>'
;
if
(
preg_match
(
'/^Error/'
,
$tmp
))
print
'<div class="error">'
.
$langs
->
trans
(
$tmp
)
.
'</div>'
;
...
@@ -295,6 +308,9 @@ foreach ($dirmodels as $reldir)
...
@@ -295,6 +308,9 @@ foreach ($dirmodels as $reldir)
print
'</table><br>'
;
print
'</table><br>'
;
/*
* Documents models for Interventions
*/
print_titre
(
$langs
->
trans
(
"TemplatePDFInterventions"
));
print_titre
(
$langs
->
trans
(
"TemplatePDFInterventions"
));
...
@@ -377,7 +393,7 @@ foreach ($dirmodels as $reldir)
...
@@ -377,7 +393,7 @@ foreach ($dirmodels as $reldir)
print
"</td>"
;
print
"</td>"
;
}
}
// Defaut
// Defau
l
t
print
"<td align=
\"
center
\"
>"
;
print
"<td align=
\"
center
\"
>"
;
if
(
$conf
->
global
->
FICHEINTER_ADDON_PDF
==
"
$name
"
)
if
(
$conf
->
global
->
FICHEINTER_ADDON_PDF
==
"
$name
"
)
{
{
...
@@ -413,11 +429,14 @@ foreach ($dirmodels as $reldir)
...
@@ -413,11 +429,14 @@ foreach ($dirmodels as $reldir)
}
}
print
'</table>'
;
print
'</table>'
;
//Autres Options
print
"<br>"
;
print
"<br>"
;
print_titre
(
$langs
->
trans
(
"OtherOptions"
));
/*
* Other options
*
*/
print_titre
(
$langs
->
trans
(
"OtherOptions"
));
print
'<table class="noborder" width="100%">'
;
print
'<table class="noborder" width="100%">'
;
print
'<tr class="liste_titre">'
;
print
'<tr class="liste_titre">'
;
print
'<td>'
.
$langs
->
trans
(
"Parameter"
)
.
'</td>'
;
print
'<td>'
.
$langs
->
trans
(
"Parameter"
)
.
'</td>'
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment