blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-23 01:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Neuer Status kann jetzt ueber Rechte Maustaste->"Neuen Status hinzufuegen" angelegt werden.

Browse Source
This commit is contained in:
Andreas Österreicher
2007-10-31 16:03:28 +00:00
parent 488375dc15
commit da9fa893fd
7 changed files with 96 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/student/studentDBDML.php
+31 -7
View File
@@ -612,20 +612,44 @@ if(!$error)
if(!$error)
{
if(!$rolle->load_rolle($_POST['prestudent_id'], $_POST['rolle_kurzbz'], $_POST['studiensemester_old'], $_POST['ausbildungssemester_old']))
if(($_POST['studiensemester_old']=='') || (!$rolle->load_rolle($_POST['prestudent_id'], $_POST['rolle_kurzbz'], $_POST['studiensemester_old'], $_POST['ausbildungssemester_old'])))
{
$errormsg = 'Rolle konnte nicht geladen werden';
$return = false;
$rolle->new = true;
$rolle->insertamum = date('Y-m-d H:i:s');
$rolle->insertvon = $user;
$rolle->rolle_kurzbz = $_POST['rolle_kurzbz'];
if($_POST['rolle_kurzbz']=='Student')
{
//Die Rolle Student darf nur eingefuegt werden, wenn schon eine Studentenrolle vorhanden ist
$qry = "SELECT count(*) as anzahl FROM public.tbl_student WHERE prestudent_id='".addslashes($_POST['prestudent_id'])."'";
if($result = pg_query($conn, $qry))
{
if($row = pg_fetch_object($result))
{
if($row->anzahl==0)
{
$error = true;
$errormsg = 'Ein Studentenstatus kann hier nur hinzugefuegt werden wenn die Person bereits Student ist. Um einen Bewerber zum Studenten zu machen waehlen Sie bitte unter "Status aendern" den Punkt "Student".';
$return = false;
}
}
}
}
}
else
{
$rolle->ausbildungssemester = $_POST['ausbildungssemester'];
{
$rolle->ausbildungssemester_old = $_POST['ausbildungssemester_old'];
$rolle->studiensemester_kurzbz = $_POST['studiensemester_kurzbz'];
$rolle->studiensemester_old = $_POST['studiensemester_old'];
$rolle->new = false;
}
if(!$error)
{
$rolle->ausbildungssemester = $_POST['ausbildungssemester'];
$rolle->studiensemester_kurzbz = $_POST['studiensemester_kurzbz'];
$rolle->datum = $_POST['datum'];
$rolle->orgform_kurzbz = $_POST['orgform_kurzbz'];
$rolle->new = false;
if($rolle->save_rolle())
$return = true;
content/student/studentdetailoverlay.xul.php
+1 -37
View File
@@ -230,6 +230,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
<popupset>
<popup id="student-prestudent-rolle-tree-popup">
<menuitem label="Bearbeiten" oncommand="StudentRolleBearbeiten();" id="student-prestudent-rolle-tree-popup-edit" hidden="false"/>
<menuitem label="Neuen Status hinzufuegen" oncommand="StudentRolleAdd();" id="student-prestudent-rolle-tree-popup-add" hidden="false"/>
<menuitem label="Entfernen" oncommand="StudentPrestudentRolleDelete();" id="student-prestudent-rolle-tree-popup-delete" hidden="false"/>
</popup>
</popupset>
@@ -499,43 +500,6 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
</rule>
</template>
</tree>
<!--<hbox>
<menulist id="student-prestudent-rolle-menulist-rolle_kurzbz" disabled="false"
datasources="<?php echo APP_ROOT ?>rdf/rolle.rdf.php"
ref="http://www.technikum-wien.at/rolle/liste" >
<template>
<menupopup>
<menuitem value="rdf:http://www.technikum-wien.at/rolle/rdf#rolle_kurzbz"
label="rdf:http://www.technikum-wien.at/rolle/rdf#rolle_kurzbz"
uri="rdf:*"/>
</menupopup>
</template>
</menulist>
<menulist id="student-prestudent-rolle-menulist-studiensemester" disabled="false"
datasources="<?php echo APP_ROOT ?>rdf/studiensemester.rdf.php"
ref="http://www.technikum-wien.at/studiensemester/liste" >
<template>
<menupopup>
<menuitem value="rdf:http://www.technikum-wien.at/studiensemester/rdf#kurzbz"
label="rdf:http://www.technikum-wien.at/studiensemester/rdf#kurzbz"
uri="rdf:*"/>
</menupopup>
</template>
</menulist>
<menulist id="student-prestudent-rolle-menulist-semester" disabled="false">
<menupopup>
<menuitem value="1" label="1"/>
<menuitem value="2" label="2"/>
<menuitem value="3" label="3"/>
<menuitem value="4" label="4"/>
<menuitem value="5" label="5"/>
<menuitem value="6" label="6"/>
<menuitem value="7" label="7"/>
<menuitem value="8" label="8"/>
</menupopup>
</menulist>
<button id="student-prestudent-rolle-button-save" label="Rolle hinzufuegen" disabled="false" oncommand="StudentRolleAdd()" />
</hbox>-->
</groupbox>
<hbox>
<spacer flex="1" />
content/student/studentoverlay.js.php
+6 -22
View File
@@ -1448,7 +1448,10 @@ function StudentRolleSpeichern(dialog, studiensemester_old, ausbildungssemester_
{
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
prestudent_id = dialog.getElementById('student-rolle-textbox-prestudent_id').value;
rolle_kurzbz = dialog.getElementById('student-rolle-textbox-rolle_kurzbz').value;
if(studiensemester_old=='')
rolle_kurzbz = dialog.getElementById('student-rolle-menulist-rolle_kurzbz').value;
else
rolle_kurzbz = dialog.getElementById('student-rolle-textbox-rolle_kurzbz').value;
studiensemester_kurzbz = dialog.getElementById('student-rolle-menulist-studiensemester').value;
ausbildungssemester = dialog.getElementById('student-rolle-menulist-ausbildungssemester').value;
datum = dialog.getElementById('student-rolle-datum-datum').value;
@@ -1538,27 +1541,8 @@ function StudentUnterbrecherZuStudent()
// ****
function StudentRolleAdd()
{
var rolle_kurzbz = document.getElementById('student-prestudent-rolle-menulist-rolle_kurzbz').value;
var studiensemester = document.getElementById('student-prestudent-rolle-menulist-studiensemester').value;
var ausbildungssemester = document.getElementById('student-prestudent-rolle-menulist-semester').value;
if(rolle_kurzbz=='')
{
alert('Typ muss ausgewaehlt werden');
return false;
}
if(studiensemester=='')
{
alert('Studiensemester muss ausgwaehlt werden');
return false;
}
if(ausbildungssemester=='')
{
alert('Semester muss ausgewaehlt werden');
return false;
}
debug('StudentAddRolle('+rolle_kurzbz+','+ ausbildungssemester+','+ studiensemester+');');
//StudentAddRolle(rolle_kurzbz, ausbildungssemester, studiensemester);
var prestudent_id = document.getElementById('student-prestudent-textbox-prestudent_id').value;
window.open('<?php echo APP_ROOT?>content/student/studentrolledialog.xul.php?prestudent_id='+prestudent_id,"","chrome, status=no, width=500, height=300, centerscreen, resizable");
}
// ****
content/student/studentrolledialog.js.php
+15 -1
View File
@@ -38,8 +38,11 @@ function StudentRolleInit(prestudent_id, rolle_kurzbz, studiensemester_kurzbz, a
{
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
if(prestudent_id!='')
if(rolle_kurzbz!='')
{
document.getElementById('student-rolle-grid-row-textbox').hidden=false;
document.getElementById('student-rolle-grid-row-menulist').hidden=true;
studiensemester_old=studiensemester_kurzbz;
ausbildungssemester_old=ausbildungssemester;
@@ -62,7 +65,18 @@ function StudentRolleInit(prestudent_id, rolle_kurzbz, studiensemester_kurzbz, a
}
else
{
studiensemester_old='';
ausbildungssemester_old='';
document.getElementById('student-rolle-grid-row-textbox').hidden=true;
document.getElementById('student-rolle-grid-row-menulist').hidden=false;
//Defaultwerte bei Neuem Datensatz
rolle_kurzbz = 'Interessent';
studiensemester_kurzbz=window.opener.getStudiensemester();
ausbildungssemester='1';
datum = '<?php echo date('d.m.Y') ?>';
orgform_kurzbz='';
}
document.getElementById('student-rolle-textbox-prestudent_id').value=prestudent_id;
content/student/studentrolledialog.xul.php
+11 -1
View File
@@ -75,10 +75,20 @@ else
<column flex="5"/>
</columns>
<rows>
<row>
<row id="student-rolle-grid-row-textbox" hidden="false">
<label value="Rolle"/>
<textbox disabled="true" id="student-rolle-textbox-rolle_kurzbz" />
</row>
<row id="student-rolle-grid-row-menulist" hidden="true">
<label value="Rolle"/>
<menulist id="student-rolle-menulist-rolle_kurzbz" disabled="false">
<menupopup>
<menuitem value="Interessent" label="Interessent"/>
<menuitem value="Bewerber" label="Bewerber"/>
<menuitem value="Student" label="Student"/>
</menupopup>
</menulist>
</row>
<row>
<label value="Studiensemester" control="student-rolle-menulist-studiensemester"/>
<menulist id="student-rolle-menulist-studiensemester"