Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Antoine
ae2
Commits
7110def4
Commit
7110def4
authored
Jul 05, 2013
by
Bate
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ajout de EE et IMSI
#4
parent
1c100087
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
45 additions
and
20 deletions
+45
-20
include/entities/utilisateur.inc.php
include/entities/utilisateur.inc.php
+1
-1
include/entities/uv.inc.php
include/entities/uv.inc.php
+12
-1
pedagogie/include/pedagogie.inc.php
pedagogie/include/pedagogie.inc.php
+4
-0
uvs/uvs.php
uvs/uvs.php
+28
-18
No files found.
include/entities/utilisateur.inc.php
View file @
7110def4
...
...
@@ -28,7 +28,7 @@ require_once("carteae.inc.php");
$GLOBALS
[
"utbm_roles"
]
=
array
(
"etu"
=>
"Étudiant"
,
"adm"
=>
"Personnel administratif"
,
"ens"
=>
"Enseignant"
,
"per"
=>
"Personnel"
,
"doc"
=>
"Doctorant"
,
"anc"
=>
"Ancien étudiant"
,
"srv"
=>
"Service"
);
$GLOBALS
[
"utbm_departements"
]
=
array
(
"tc"
=>
"TC"
,
"gi"
=>
"GI"
,
"imap"
=>
"IMAP"
,
"gesc"
=>
"GESC"
,
"mc"
=>
"MC"
,
"edim"
=>
"EDIM"
,
"huma"
=>
"Humanités"
,
"na"
=>
"N/A"
);
$GLOBALS
[
"utbm_departements"
]
=
array
(
"tc"
=>
"TC"
,
"gi"
=>
"GI"
,
"imap"
=>
"IMAP"
,
"imsi"
=>
"IMSI"
,
"ee"
=>
"EE"
,
"gesc"
=>
"GESC"
,
"mc"
=>
"MC"
,
"edim"
=>
"EDIM"
,
"huma"
=>
"Humanités"
,
"na"
=>
"N/A"
);
/**
* Classe permetant la gestion d'un utilisateur
...
...
include/entities/uv.inc.php
View file @
7110def4
...
...
@@ -95,7 +95,7 @@ $uvcomm_qualite = array ('-1' => 'Sans avis',
'4'
=>
'Excellente'
);
$departements
=
array
(
'Humanites'
,
'TC'
,
'GESC'
,
'GI'
,
'IMAP'
,
'GMC'
,
'EDIM'
);
$departements
=
array
(
'Humanites'
,
'TC'
,
'GESC'
,
'EE'
,
'GI'
,
'IMAP'
,
'IMSI'
,
'GMC'
,
'EDIM'
);
/** tableaux sur la catégorisation des UVs à l'intérieur des départements */
...
...
@@ -113,6 +113,11 @@ $gesc_cat = array(''=> null,
'TM'
=>
'TM'
,
'RN'
=>
'RN'
,
'EX'
=>
'EX'
);
$ee_cat
=
array
(
''
=>
null
,
'CS'
=>
'CS'
,
'TM'
=>
'TM'
,
'RN'
=>
'RN'
,
'EX'
=>
'EX'
);
$gi_cat
=
array
(
''
=>
null
,
'CS'
=>
'CS'
,
'TM'
=>
'TM'
,
...
...
@@ -131,6 +136,12 @@ $imap_cat = array('' => null,
'RN'
=>
'RN'
,
'EX'
=>
'EX'
);
$imsi_cat
=
array
(
''
=>
null
,
'CS'
=>
'CS'
,
'TM'
=>
'TM'
,
'RN'
=>
'RN'
,
'EX'
=>
'EX'
);
$uv_descr_cat
=
array
(
'NA'
=>
'Inconnu'
,
'CS'
=>
'Connaissances scientifiques'
,
'TM'
=>
'Techniques et méthodes'
,
...
...
pedagogie/include/pedagogie.inc.php
View file @
7110def4
...
...
@@ -122,12 +122,16 @@ define("DPT_GESC", 4);
define
(
"DPT_IMAP"
,
5
);
define
(
"DPT_GMC"
,
6
);
define
(
"DPT_EDIM"
,
7
);
define
(
"DPT_EE"
,
8
);
define
(
"DPT_IMSI"
,
9
);
$_DPT
=
array
(
DPT_HUMA
=>
array
(
'short'
=>
'Humas'
,
'long'
=>
"Humanités"
),
DPT_TC
=>
array
(
'short'
=>
'TC'
,
'long'
=>
"Tronc Commun"
),
DPT_GI
=>
array
(
'short'
=>
'GI'
,
'long'
=>
"Informatique"
),
DPT_GESC
=>
array
(
'short'
=>
'GESC'
,
'long'
=>
"Génie Électrique et Systèmes de Commande"
),
DPT_IMAP
=>
array
(
'short'
=>
'IMAP'
,
'long'
=>
"Ingénierie et Management de Process"
),
DPT_EE
=>
array
(
'short'
=>
'EE'
,
'long'
=>
"Génie Électrique et Systèmes de Commande"
),
DPT_IMSI
=>
array
(
'short'
=>
'IMSI'
,
'long'
=>
"Ingénierie et Management de Process"
),
DPT_GMC
=>
array
(
'short'
=>
'MC'
,
'long'
=>
"Mécanique et Conception"
),
DPT_EDIM
=>
array
(
'short'
=>
'EDIM'
,
'long'
=>
"Ergonomie, Design et Ingénierie Mécanique"
)
);
...
...
uvs/uvs.php
View file @
7110def4
...
...
@@ -340,6 +340,11 @@ if (($site->user->is_in_group('gestion_ae'))
$departements
[]
=
'GESC'
;
$stats_by_depts
[
'GESC'
]
=
$_REQUEST
[
'cat_gesc'
];
}
if
(
$_REQUEST
[
'EE'
]
==
1
)
{
$departements
[]
=
'EE'
;
$stats_by_depts
[
'EE'
]
=
$_REQUEST
[
'cat_ee'
];
}
if
(
$_REQUEST
[
'GI'
]
==
1
)
{
$departements
[]
=
'GI'
;
...
...
@@ -350,6 +355,11 @@ if (($site->user->is_in_group('gestion_ae'))
$departements
[]
=
'IMAP'
;
$stats_by_depts
[
'IMAP'
]
=
$_REQUEST
[
'cat_imap'
];
}
if
(
$_REQUEST
[
'IMSI'
]
==
1
)
{
$departements
[]
=
'IMSI'
;
$stats_by_depts
[
'IMSI'
]
=
$_REQUEST
[
'cat_imsi'
];
}
if
(
$_REQUEST
[
'GMC'
]
==
1
)
{
$departements
[]
=
'GMC'
;
...
...
@@ -550,17 +560,17 @@ if (isset($_REQUEST['id_uv']) || (isset($_REQUEST['code_uv']))
"TC"
,
in_array
(
'TC'
,
$uvdept
));
$edituv
->
add_checkbox
(
'
GESC
'
,
"
GESC
"
,
in_array
(
'
GESC
'
,
$uvdept
));
$edituv
->
add_checkbox
(
'
EE
'
,
"
EE
"
,
in_array
(
'
EE
'
,
$uvdept
));
$edituv
->
add_checkbox
(
'GI'
,
"GI"
,
in_array
(
'GI'
,
$uvdept
));
$edituv
->
add_checkbox
(
'IM
AP
'
,
"IM
AP
"
,
in_array
(
'IM
AP
'
,
$uvdept
));
$edituv
->
add_checkbox
(
'IM
SI
'
,
"IM
SI
"
,
in_array
(
'IM
SI
'
,
$uvdept
));
$edituv
->
add_checkbox
(
'GMC'
,
"GMC"
,
...
...
@@ -582,18 +592,18 @@ if (isset($_REQUEST['id_uv']) || (isset($_REQUEST['code_uv']))
$edituv
->
add_select_field
(
'cat_tc'
,
"Catégorie de l'UV au département TC"
,
$tc_cat
,
$cat_by_depts
[
$dept
]);
else
if
(
$dept
==
'
GESC
'
)
$edituv
->
add_select_field
(
'cat_
gesc
'
,
"Catégorie de l'UV au département
GESC
"
,
$
gesc
_cat
,
$cat_by_depts
[
$dept
]);
else
if
(
$dept
==
'
EE
'
)
$edituv
->
add_select_field
(
'cat_
ee
'
,
"Catégorie de l'UV au département
EE
"
,
$
ee
_cat
,
$cat_by_depts
[
$dept
]);
else
if
(
$dept
==
'GI'
)
$edituv
->
add_select_field
(
'cat_gi'
,
"Catégorie de l'UV au département GI"
,
$gi_cat
,
$cat_by_depts
[
$dept
]);
else
if
(
$dept
==
'IM
AP
'
)
$edituv
->
add_select_field
(
'cat_im
ap
'
,
"Catégorie de l'UV au département IM
AP
"
,
$im
ap
_cat
,
$cat_by_depts
[
$dept
]);
else
if
(
$dept
==
'IM
SI
'
)
$edituv
->
add_select_field
(
'cat_im
si
'
,
"Catégorie de l'UV au département IM
SI
"
,
$im
si
_cat
,
$cat_by_depts
[
$dept
]);
else
if
(
$dept
==
'GMC'
)
$edituv
->
add_select_field
(
'cat_gmc'
,
"Catégorie de l'UV au département GMC"
,
...
...
@@ -838,14 +848,14 @@ if (isset($_REQUEST['id_uv']) || (isset($_REQUEST['code_uv']))
$exts
[]
=
"<a href=
\"
http://www.utbm.fr/index.php?pge=207
\"
><b>Site de l'UTBM</b>, information sur le département des Humanités</a>"
;
if
(
$departement
==
'TC'
)
$exts
[]
=
"<a href=
\"
http://www.utbm.fr/index.php?pge=205
\"
><b>Site de l'UTBM</b>, information sur le département de Tronc Commun</a>"
;
if
(
$departement
==
'
GESC
'
)
if
(
$departement
==
'
EE
'
)
$exts
[]
=
"<a href=
\"
http://www.utbm.fr/index.php?pge=70
\"
><b>Site de l'UTBM</b>, information sur le département du Génie Electrique et "
.
"Systèmes de Commande (
GESC
)</a>"
;
"Systèmes de Commande (
EE
)</a>"
;
if
(
$departement
==
'GI'
)
$exts
[]
=
"<a href=
\"
http://www.utbm.fr/index.php?pge=67
\"
><b>Site de l'UTBM</b>, information sur le département du Génie Informatique (GI)</a>"
;
if
(
$departement
==
'IM
AP
'
)
if
(
$departement
==
'IM
SI
'
)
$exts
[]
=
"<a href=
\"
http://www.utbm.fr/index.php?pge=69
\"
><b>Site de l'UTBM</b>, information sur le département de l'Ingénierie et"
.
" management de process (IM
AP
)</a>"
;
" management de process (IM
SI
)</a>"
;
if
(
$departement
==
'GMC'
)
$exts
[]
=
"<a href=
\"
http://www.utbm.fr/index.php?pge=68
\"
><b>Site de l'UTBM</b>, information sur le département du Génie Mécanique "
.
"et conception (GMC)</a>"
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment