Skip to content
Snippets Groups Projects
Commit c3895b16 authored by Gerd Schachtschneider's avatar Gerd Schachtschneider
Browse files

Update 1.1.11

parent dc03d872
No related branches found
No related tags found
No related merge requests found
Expand all Show whitespace changes
Inline Side-by-side
Showing
with 1038 additions and 274 deletions
conf.ini
+ 3
− 3
View file @ c3895b16
...@@ -36,7 +36,7 @@ modules_datepicker=modules/datepicker/datepicker.php ...@@ -36,7 +36,7 @@ modules_datepicker=modules/datepicker/datepicker.php
[_own] [_own]
dn = "mpi-magdeburg.mpg.de" dn = "mpi-magdeburg.mpg.de"
notify = 30 notify = 30
version = 1.1.08 version = 1.1.11
mailto = "db-responsable@<domain>.mpg.de" mailto = "db-responsable@<domain>.mpg.de"
mailname = "db-admin" mailname = "db-admin"
...@@ -51,8 +51,8 @@ mpi_chemstoff = "Chemiestoff" ...@@ -51,8 +51,8 @@ mpi_chemstoff = "Chemiestoff"
view_chemstoff = "ChemSt_Ablage" view_chemstoff = "ChemSt_Ablage"
mpi_mengenfluss = "Lagerbewegung" mpi_mengenfluss = "Lagerbewegung"
mpi_gefahr = "Gefahrenkl." mpi_gefahr = "Gefahrenkl."
mpi_bestell = "BestNr_Lieferant" mpi_bestell = "Bestellnummer"
mpi_ablage = "Dateiablage" mpi_ablage = "Ablage"
mpi_lieferant = "Lieferant" mpi_lieferant = "Lieferant"
mpi_lagerort = "Lagerort" mpi_lagerort = "Lagerort"
view_chemAll = "Chemiest. MPI" view_chemAll = "Chemiest. MPI"
......
cronjobs/cronDatabase.php
+ 9
− 7
View file @ c3895b16
...@@ -46,17 +46,19 @@ ...@@ -46,17 +46,19 @@
} }
} }
// loesche alle Ablagen, welche keine Verbindung mehr haben, auch keine verlinkten in Chemiestoff // loesche alle Ablagen, welche keine Verbindung mehr haben, auch in Chemiestoff rueckwaerts
$sql = <<<EOT $sql = <<<EOT
DELETE DELETE
mpi_ablage abl
FROM FROM
mpi_ablage mpi_ablage AS abl
LEFT JOIN mpi_chemstoff AS chem ON chem.bFileID = ablageID OR chem.sFileID = ablageID LEFT JOIN mpi_chemstoff AS chem ON (chem.bFileID = abl.ablageID OR chem.sFileID = abl.ablageID)
LEFT JOIN con_ablageBest AS conB ON conB.ablageID = abl.ablageID
LEFT JOIN con_ablageLief AS conL ON conL.ablageID = abl.ablageID
WHERE WHERE
tabID IS NULL AND chem.tabID IS NULL AND
bestellID IS NULL AND conB.conID IS NULL AND
lieferID IS NULL conL.conID IS NULL
EOT; EOT;
mysql_query($sql) or die(mysql_error()); mysql_query($sql) or die(mysql_error());
......
custom.css
+ 73
− 16
View file @ c3895b16
/* indiv. table background colors */ /* indiv. table background colors */
td.Dataface_QuickForm-label-cell.mpi_chemstoff, td.Dataface_QuickForm-label-cell.mpi_chemstoff,
td.Dataface_QuickForm-label-cell.chemstoff { background-color: #b0cfb2; } td.Dataface_QuickForm-label-cell.chemiestoff { background-color: #b0cfb2; }
td#dataface-sections-main-column.mpi_chemstoff, td#dataface-sections-main-column.mpi_chemstoff,
td#dataface-sections-left-column.mpi_chemstoff, td#dataface-sections-left-column.mpi_chemstoff,
#table_selection_tabs li.nav.mpi_chemstoff:hover, #table_selection_tabs li.nav.mpi_chemstoff:hover,
#table_selection_tabs li.selected.mpi_chemstoff, #table_selection_tabs li.selected.mpi_chemstoff,
#status-bar.mpi_chemstoff, #status-bar.mpi_chemstoff,
td.Dataface_QuickForm-widget-cell.mpi_chemstoff, td.Dataface_QuickForm-widget-cell.mpi_chemstoff,
td.Dataface_QuickForm-widget-cell.chemstoff, td.Dataface_QuickForm-widget-cell.chemiestoff,
div.dataface-view-section.chemiestoff_ba, div.dataface-view-section.chemiestoff_sdb, div.dataface-view-section.chemiestoff,
a#record-tabs-chemstoff_ba-link:hover, a#record-tabs-chemstoff_sdb-link:hover, div.dataface-view-section.chemiestoff_ba,
.contentViews .selected a#record-tabs-chemstoff_ba-link, .contentViews .selected a#record-tabs-chemstoff_sdb-link, div.dataface-view-section.chemiestoff_sdb,
a#record-tabs-chemiestoff-link:hover,
a#record-tabs-chemiestoff_ba-link:hover,
a#record-tabs-chemiestoff_sdb-link:hover,
.contentViews .selected a#record-tabs-chemiestoff,
.contentViews .selected a#record-tabs-chemiestoff_ba-link,
.contentViews .selected a#record-tabs-chemiestoff_sdb-link,
tr.listing.odd.mpi_chemstoff td { background-color: #dfece0; } tr.listing.odd.mpi_chemstoff td { background-color: #dfece0; }
tr.listing.even.mpi_chemstoff td { background-color: #eff5f0; } tr.listing.even.mpi_chemstoff td { background-color: #eff5f0; }
/* speziell */
td.Dataface_QuickForm-label-cell.nutzer,
td.Dataface_QuickForm-label-cell.unterweisung { background-color: #aec4d0; }
td.Dataface_QuickForm-widget-cell.nutzer,
td.Dataface_QuickForm-widget-cell.unterweisung { background-color: #f2f2f2; }
td.Dataface_QuickForm-label-cell.view_chemstoff, td.Dataface_QuickForm-label-cell.view_chemstoff,
td.Dataface_QuickForm-label-cell.chemstoff { background-color: #a4a4c1; } td.Dataface_QuickForm-label-cell.chemstoff { background-color: #a4a4c1; }
...@@ -45,36 +57,43 @@ tr.listing.odd.con_chemLager td { background-color: #d9e6f2; } ...@@ -45,36 +57,43 @@ tr.listing.odd.con_chemLager td { background-color: #d9e6f2; }
tr.listing.even.con_chemLager td { background-color: #ecf2f9; } tr.listing.even.con_chemLager td { background-color: #ecf2f9; }
td.Dataface_QuickForm-label-cell.mpi_lagerort, td.Dataface_QuickForm-label-cell.mpi_lagerort,
td.Dataface_QuickForm-label-cell.ablageort { background-color: #94b8b8; } td.Dataface_QuickForm-label-cell.con_chemLager,
td.Dataface_QuickForm-label-cell.lagerort { background-color: #94b8b8; }
td#dataface-sections-main-column.mpi_lagerort, td#dataface-sections-main-column.mpi_lagerort,
td#dataface-sections-left-column.mpi_lagerort, td#dataface-sections-left-column.mpi_lagerort,
#table_selection_tabs li.nav.mpi_lagerort:hover, #table_selection_tabs li.nav.mpi_lagerort:hover,
#table_selection_tabs li.selected.mpi_lagerort, #table_selection_tabs li.selected.mpi_lagerort,
#status-bar.mpi_lagerort, #status-bar.mpi_lagerort,
td.Dataface_QuickForm-widget-cell.mpi_lagerort, td.Dataface_QuickForm-widget-cell.mpi_lagerort,
td.Dataface_QuickForm-widget-cell.ablageort, td.Dataface_QuickForm-label-widget.con_chemLager,
div.dataface-view-section.ablageort, td.Dataface_QuickForm-widget-cell.lagerort,
a#record-tabs-ablageort-link:hover, div.dataface-view-section.lagerort,
.contentViews .selected a#record-tabs-ablageort-link, a#record-tabs-lagerort-link:hover,
.contentViews .selected a#record-tabs-lagerort-link,
tr.listing.odd.con_chemLager td,
tr.listing.odd.mpi_lagerort td { background-color: #e0ebeb; } tr.listing.odd.mpi_lagerort td { background-color: #e0ebeb; }
tr.listing.even.con_chemLager td,
tr.listing.even.mpi_lagerort td { background-color: #f0f5f5; } tr.listing.even.mpi_lagerort td { background-color: #f0f5f5; }
td.Dataface_QuickForm-label-cell.mpi_bestell, td.Dataface_QuickForm-label-cell.mpi_bestell,
td.Dataface_QuickForm-label-cell.bestnr_lieferant { background-color: #ffdc99; } td.Dataface_QuickForm-label-cell.bestellnummer { background-color: #ffdc99; }
td#dataface-sections-main-column.mpi_bestell, td#dataface-sections-main-column.mpi_bestell,
td#dataface-sections-left-column.mpi_bestell, td#dataface-sections-left-column.mpi_bestell,
#table_selection_tabs li.nav.mpi_bestell:hover, #table_selection_tabs li.nav.mpi_bestell:hover,
#table_selection_tabs li.selected.mpi_bestell, #table_selection_tabs li.selected.mpi_bestell,
#status-bar.mpi_bestell, #status-bar.mpi_bestell,
td.Dataface_QuickForm-widget-cell.mpi_bestell, td.Dataface_QuickForm-widget-cell.mpi_bestell,
td.Dataface_QuickForm-widget-cell.bestnr_lieferant, td.Dataface_QuickForm-widget-cell.bestellnummer,
div.dataface-view-section.bestnr_lieferant, div.dataface-view-section.bestellnummer,
a#record-tabs-bestnr_lieferant-link:hover, a#record-tabs-bestellnummer-link:hover,
.contentViews .selected a#record-tabs-bestnr_lieferant-link, .contentViews .selected a#record-tabs-bestellnummer-link,
tr.listing.odd.con_chemBest td,
tr.listing.odd.mpi_bestell td { background-color: #ffefcc; } tr.listing.odd.mpi_bestell td { background-color: #ffefcc; }
tr.listing.even.con_chemBest td,
tr.listing.even.mpi_bestell td { background-color: #fff7e5; } tr.listing.even.mpi_bestell td { background-color: #fff7e5; }
td.Dataface_QuickForm-label-cell.mpi_gefahr, td.Dataface_QuickForm-label-cell.mpi_gefahr,
td.Dataface_QuickForm-label-cell.lagerklasse,
td.Dataface_QuickForm-label-cell.gefahrenklasse { background-color: #df9fc0; } td.Dataface_QuickForm-label-cell.gefahrenklasse { background-color: #df9fc0; }
td#dataface-sections-main-column.mpi_gefahr, td#dataface-sections-main-column.mpi_gefahr,
td#dataface-sections-left-column.mpi_gefahr, td#dataface-sections-left-column.mpi_gefahr,
...@@ -83,10 +102,16 @@ td#dataface-sections-left-column.mpi_gefahr, ...@@ -83,10 +102,16 @@ td#dataface-sections-left-column.mpi_gefahr,
#status-bar.mpi_gefahr, #status-bar.mpi_gefahr,
td.Dataface_QuickForm-widget-cell.mpi_gefahr, td.Dataface_QuickForm-widget-cell.mpi_gefahr,
td.Dataface_QuickForm-widget-cell.gefahrenklasse, td.Dataface_QuickForm-widget-cell.gefahrenklasse,
td.Dataface_QuickForm-widget-cell.lagerklasse,
div.dataface-view-section.gefahrenklasse, div.dataface-view-section.gefahrenklasse,
div.dataface-view-section.lagerklasse,
a#record-tabs-gefahrenklasse-link:hover, a#record-tabs-gefahrenklasse-link:hover,
a#record-tabs-lagerklasse-link:hover,
.contentViews .selected a#record-tabs-gefahrenklasse-link, .contentViews .selected a#record-tabs-gefahrenklasse-link,
.contentViews .selected a#record-tabs-lagerklasse-link,
tr.listing.odd.con_lagerLgk td,
tr.listing.odd.mpi_gefahr td { background-color: #f2d9e6; } tr.listing.odd.mpi_gefahr td { background-color: #f2d9e6; }
tr.listing.even.con_lagerLgk td,
tr.listing.even.mpi_gefahr td { background-color: #f9ecf2; } tr.listing.even.mpi_gefahr td { background-color: #f9ecf2; }
td.Dataface_QuickForm-label-cell.mpi_ablage, td.Dataface_QuickForm-label-cell.mpi_ablage,
...@@ -98,12 +123,28 @@ td#dataface-sections-left-column.mpi_ablage, ...@@ -98,12 +123,28 @@ td#dataface-sections-left-column.mpi_ablage,
#status-bar.mpi_ablage, #status-bar.mpi_ablage,
td.Dataface_QuickForm-widget-cell.mpi_ablage, td.Dataface_QuickForm-widget-cell.mpi_ablage,
td.Dataface_QuickForm-widget-cell.ablage, td.Dataface_QuickForm-widget-cell.ablage,
div.dataface-view-section.ablage_ba, div.dataface-view-section.ablage_sdb, div.dataface-view-section.ablage,
div.dataface-view-section.zertifikat,
div.dataface-view-section.ablage_ba,
div.dataface-view-section.ablage_sdb,
a#record-tabs-ablage-link:hover, a#record-tabs-ablage-link:hover,
a#record-tabs-zertifikat-link:hover,
.contentViews .selected a#record-tabs-ablage-link, .contentViews .selected a#record-tabs-ablage-link,
.contentViews .selected a#record-tabs-zertifikat-link,
tr.listing.odd.mpi_ablage td { background-color: #f3e6d8; } tr.listing.odd.mpi_ablage td { background-color: #f3e6d8; }
tr.listing.even.mpi_ablage td { background-color: #f9f2ec; } tr.listing.even.mpi_ablage td { background-color: #f9f2ec; }
td.Dataface_QuickForm-label-cell.view_ablageAll,
td.Dataface_QuickForm-label-cell.ablage { background-color: #e1c09e; }
td#dataface-sections-main-column.view_ablageAll,
td#dataface-sections-left-column.view_ablageAll,
#table_selection_tabs li.nav.view_ablageAll:hover,
#table_selection_tabs li.selected.view_ablageAll,
#status-bar.view_ablageAll,
td.Dataface_QuickForm-widget-cell.view_ablageAll,
tr.listing.odd.view_ablageAll td { background-color: #f3e6d8; }
tr.listing.even.view_ablageAll td { background-color: #f9f2ec; }
td.Dataface_QuickForm-label-cell.mpi_mengenfluss, td.Dataface_QuickForm-label-cell.mpi_mengenfluss,
td.Dataface_QuickForm-label-cell.mengenfluss { background-color: #aec4d0; } td.Dataface_QuickForm-label-cell.mengenfluss { background-color: #aec4d0; }
td#dataface-sections-main-column.mpi_mengenfluss, td#dataface-sections-main-column.mpi_mengenfluss,
...@@ -119,6 +160,22 @@ a#record-tabs-mengenfluss-link:hover, ...@@ -119,6 +160,22 @@ a#record-tabs-mengenfluss-link:hover,
tr.listing.odd.mpi_mengenfluss td { background-color: #f2f2f2; } tr.listing.odd.mpi_mengenfluss td { background-color: #f2f2f2; }
tr.listing.even.mpi_mengenfluss td { background-color: #fafafa; } tr.listing.even.mpi_mengenfluss td { background-color: #fafafa; }
td.Dataface_QuickForm-label-cell.mpi_lieferant,
td.Dataface_QuickForm-label-cell.lieferant { background-color: #d4d4aa; }
td#dataface-sections-main-column.mpi_lieferant,
td#dataface-sections-left-column.mpi_lieferant,
#table_selection_tabs li.nav.mpi_lieferant:hover,
#table_selection_tabs li.selected.mpi_lieferant,
#status-bar.mpi_lieferant,
td.Dataface_QuickForm-widget-cell.mpi_lieferant,
td.Dataface_QuickForm-widget-cell.lieferant,
div.dataface-view-section.lieferant,
a#record-tabs-lieferant-link:hover,
.contentViews .selected a#record-tabs-lieferant-link,
tr.listing.odd.mpi_lieferant td { background-color: #eeeedd; }
tr.listing.even.mpi_lieferant td { background-color: #f6f6ee; }
/* ueberschreibt vorherige listenfarbe links */ /* ueberschreibt vorherige listenfarbe links */
tr.listing.odd.sand td.row-actions-cell, tr.listing.odd.sand td.row-actions-cell,
tr.listing.even.sand td.row-actions-cell { background-color: #FFFCED; } tr.listing.even.sand td.row-actions-cell { background-color: #FFFCED; }
......
custom.js
+ 1
− 1
View file @ c3895b16
// funktioniert zwar, aber nicht ausreichend fuer depselect // funktioniert zwar, aber fuer nicht ausreichend fuer depselect
function chemstoff(chemID) { function chemstoff(chemID) {
//alert("chem-" + chemID + "-gewaehlt"); //alert("chem-" + chemID + "-gewaehlt");
//var x = document.getElementById('chemID').selectedIndex; //var x = document.getElementById('chemID').selectedIndex;
......
index.php
+ 6
− 8
View file @ c3895b16
...@@ -16,14 +16,12 @@ ...@@ -16,14 +16,12 @@
} }
// Sortierreihenfolge in Relationship aendern // Sortierreihenfolge in Relationship aendern
if ( !isset($_REQUEST['-related:sort']) and @$_REQUEST['-relationship'] == 'mengenfluss' ) if ( !isset($_REQUEST['-related:sort']) and @$_REQUEST['-relationship'] == 'mengenfluss' ) {
{
$_REQUEST['-related:sort'] = $_GET['-related:sort'] = 'zeitstempel desc'; $_REQUEST['-related:sort'] = $_GET['-related:sort'] = 'zeitstempel desc';
} }
if ( !isset($_REQUEST['-related:sort']) and @$_REQUEST['-relationship'] == 'ablageort' ) if ( !isset($_REQUEST['-sort']) and @$_REQUEST['-table'] == 'mpi_ablage' ) {
{ $_REQUEST['-sort'] = $_GET['-sort'] = 'zeitstempel desc';
$_REQUEST['-related:sort'] = $_GET['-related:sort'] = 'zeitstempel desc';
} }
require_once '/var/www/xataface/dataface-public-api.php'; require_once '/var/www/xataface/dataface-public-api.php';
......
install/LIESMICH.txt
+ 3
− 0
View file @ c3895b16
...@@ -24,6 +24,9 @@ Was muss ich anpassen: ...@@ -24,6 +24,9 @@ Was muss ich anpassen:
mysql -p -u root < install/joinGfk2Chem.sql mysql -p -u root < install/joinGfk2Chem.sql
mysql -p -u root < install/joinChem2Gfk.sql mysql -p -u root < install/joinChem2Gfk.sql
7. View's auf evtl. andere vorhandene Chemiedatenbanken
mysql -p -u root < install/joinChem2Chem.sql
8. Autorisierung auf ldap umstellen 8. Autorisierung auf ldap umstellen
Eintrag #auth_type = basic disable per Raute Eintrag #auth_type = basic disable per Raute
Eintrag auth_type = ldap enable Raute entfernen Eintrag auth_type = ldap enable Raute entfernen
......
install/joinChem2Chem.sql
+ 38
− 0
View file @ c3895b16
...@@ -12,6 +12,24 @@ CREATE OR REPLACE VIEW view_ablageAll AS ...@@ -12,6 +12,24 @@ CREATE OR REPLACE VIEW view_ablageAll AS
'2016-04-22 11:34:18' AS zeitstempel '2016-04-22 11:34:18' AS zeitstempel
; ;
CREATE OR REPLACE VIEW view_chemAll AS
SELECT
'1' AS tabID,
'Fake Eintrag wenn keine chemDB' AS substanz,
'-' AS reinheit,
'-' AS lgk,
'0' AS cmr,
'-' AS cas,
'-' AS einheit,
'0' AS bFileID,
'-' AS bFilename,
'0' AS sFileID,
'-' AS sFilename,
'mpg' AS gruppe,
'initial' AS bearbeiter,
'2016-05-03 11:34:18' AS zeitstempel
;
-- version mpg mit mpg_chem -- version mpg mit mpg_chem
-- entsprechend erweitern/anpassen, wenn mehr chemie-db's existieren -- entsprechend erweitern/anpassen, wenn mehr chemie-db's existieren
...@@ -34,3 +52,23 @@ CREATE OR REPLACE VIEW view_ablageAll AS ...@@ -34,3 +52,23 @@ CREATE OR REPLACE VIEW view_ablageAll AS
filename filename
; ;
CREATE OR REPLACE VIEW view_chemAll AS
SELECT
mpg.tabID AS tabID,
mpg.substanz AS substanz,
mpg.reinheit AS reinheit,
mpg.lgk AS lgk,
mpg.cmr AS cmr,
mpg.cas AS cas,
mpg.einheit AS einheit,
LPAD(mpg.bFileID, 6, '0') AS bFileID,
(SELECT file_filename FROM mpidb_mpg_chem.mpi_ablage WHERE mpg.bFileID = ablageID) AS bFilename,
LPAD(mpg.sFileID, 6, '0') AS sFileID,
(SELECT file_filename FROM mpidb_mpg_chem.mpi_ablage WHERE mpg.sFileID = ablageID) AS sFilename,
'mpg' AS gruppe,
mpg.bearbeiter AS bearbeiter,
mpg.zeitstempel AS zeitstempel
FROM mpidb_mpg_chem.mpi_chemstoff AS mpg
;
install/mpidb_mpg_chem.sql
+ 320
− 174
View file @ c3895b16
This diff is collapsed.
install/updateDB_1000.sql
+ 185
− 65
View file @ c3895b16
...@@ -60,10 +60,10 @@ END IF; ...@@ -60,10 +60,10 @@ END IF;
INSERT IGNORE INTO con_chemLager (chemID, lagerID) SELECT chem.tabID AS chemID, (SELECT lagerID FROM mpi_lagerort WHERE ablageort = chem.ablageort) AS lagerID FROM mpi_chemstoff AS chem WHERE chem.ablageort IS NOT NULL AND chem.ablageort <> '' ORDER BY lagerID; INSERT IGNORE INTO con_chemLager (chemID, lagerID) SELECT chem.tabID AS chemID, (SELECT lagerID FROM mpi_lagerort WHERE ablageort = chem.ablageort) AS lagerID FROM mpi_chemstoff AS chem WHERE chem.ablageort IS NOT NULL AND chem.ablageort <> '' ORDER BY lagerID;
-- db::list_reiter - add con_chemLager, add view_chemAll, change view_chemstoff -- db::list_reiter - add con_chemLager, add view_chemAll, change view_chemstoff
INSERT IGNORE INTO list_reiter (autoID, reiter, kategorie, favorit, history, bedeutung) VALUES ('60','con_chemLager','Zuordnung','0','0','Mehrfachverbindung Chemiestoff-Lagerort'); INSERT IGNORE INTO list_reiter (reiter, kategorie, favorit, history, bedeutung) VALUES ('con_chemLager','Zuordnung','0','0','Mehrfachverbindung Chemiestoff-Lagerort');
UPDATE list_reiter SET reiter = 'view_chemAll' WHERE list_reiter.autoID = '300'; UPDATE list_reiter SET reiter = 'view_chemAll' WHERE list_reiter.autoID = '300';
INSERT IGNORE INTO list_reiter (autoID, reiter, kategorie, favorit, history, bedeutung) VALUES ('305', 'view_chemstoff', 'View', '1', '0', 'Zeige alle Stoffe mit Lager und Menge'); INSERT IGNORE INTO list_reiter (reiter, kategorie, favorit, history, bedeutung) VALUES ('view_chemstoff', 'View', '1', '0', 'Zeige alle Stoffe mit Lager und Menge');
UPDATE list_reiter SET favorit = '1' WHERE list_reiter.autoID = '210'; UPDATE list_reiter SET favorit = '1' WHERE reiter = 'mpi_chemstoff';
-- db::mpi_chemstoff - loesche alten ablageort -- db::mpi_chemstoff - loesche alten ablageort
ALTER TABLE mpi_chemstoff DROP FOREIGN KEY `mpi_chemstoff_ibfk_5`; ALTER TABLE mpi_chemstoff DROP FOREIGN KEY `mpi_chemstoff_ibfk_5`;
...@@ -73,65 +73,6 @@ END IF; ...@@ -73,65 +73,6 @@ END IF;
ALTER TABLE mpi_chemstoff CHANGE gift gift TINYINT(1) NULL DEFAULT '0'; ALTER TABLE mpi_chemstoff CHANGE gift gift TINYINT(1) NULL DEFAULT '0';
ALTER TABLE mpi_chemstoff CHANGE menge menge SMALLINT(5) NULL DEFAULT '0'; ALTER TABLE mpi_chemstoff CHANGE menge menge SMALLINT(5) NULL DEFAULT '0';
-- view view_chemAll - wegen drop ablageort, menge
CREATE OR REPLACE VIEW view_chemAll AS
SELECT
bio.tabID AS tabID,
bio.substanz AS substanz,
bio.reinheit AS reinheit,
bio.lgk AS lgk,
bio.cmr AS cmr,
bio.cas AS cas,
bio.einheit AS einheit,
'bio' AS gruppe,
bio.bearbeiter AS bearbeiter,
bio.zeitstempel AS zeitstempel
FROM mpidb_bio_chem.mpi_chemstoff AS bio
UNION ALL
SELECT
bpe.tabID AS tabID,
bpe.substanz AS substanz,
bpe.reinheit AS reinheit,
bpe.lgk AS lgk,
bpe.cmr AS cmr,
bpe.cas AS cas,
bpe.einheit AS einheit,
'bpe' AS gruppe,
bpe.bearbeiter AS bearbeiter,
bpe.zeitstempel AS zeitstempel
FROM
mpidb_bpe_chem.mpi_chemstoff AS bpe
UNION ALL
SELECT
pcg.tabID AS tabID,
pcg.substanz AS substanz,
pcg.reinheit AS reinheit,
pcg.lgk AS lgk,
pcg.cmr AS cmr,
pcg.cas AS cas,
pcg.einheit AS einheit,
'pcg' AS gruppe,
pcg.bearbeiter AS bearbeiter,
pcg.zeitstempel AS zeitstempel
FROM
mpidb_pcg_chem.mpi_chemstoff AS pcg
UNION ALL
SELECT
pse.tabID AS tabID,
pse.substanz AS substanz,
pse.reinheit AS reinheit,
pse.lgk AS lgk,
pse.cmr AS cmr,
pse.cas AS cas,
pse.einheit AS einheit,
'pse' AS gruppe,
pse.bearbeiter AS bearbeiter,
pse.zeitstempel AS zeitstempel
FROM
mpidb_pse_chem.mpi_chemstoff AS pse
;
-- ende view
TRUNCATE dataface__version; TRUNCATE dataface__version;
INSERT INTO dataface__version (version) VALUES ('1002'); INSERT INTO dataface__version (version) VALUES ('1002');
...@@ -159,7 +100,7 @@ END IF; ...@@ -159,7 +100,7 @@ END IF;
ALTER TABLE con_lagerLgk ADD CONSTRAINT con_lagerLgk_lagerID FOREIGN KEY (lagerID) REFERENCES mpi_lagerort (lagerID) ON DELETE CASCADE; ALTER TABLE con_lagerLgk ADD CONSTRAINT con_lagerLgk_lagerID FOREIGN KEY (lagerID) REFERENCES mpi_lagerort (lagerID) ON DELETE CASCADE;
-- db::list_reiter - add con_lagerLgk -- db::list_reiter - add con_lagerLgk
INSERT INTO list_reiter (autoID, reiter, kategorie, favorit, history, bedeutung) VALUES ('70', 'con_lagerLgk', 'Zuordnung', '0', '1', 'Mehrfachzuordnung Lagerklasse zu Lagerort'); INSERT INTO list_reiter (reiter, kategorie, favorit, history, bedeutung) VALUES ('con_lagerLgk', 'Zuordnung', '0', '1', 'Mehrfachzuordnung Lagerklasse zu Lagerort');
-- db::con_lagerLgk - alte Version konvertieren -- db::con_lagerLgk - alte Version konvertieren
INSERT INTO con_lagerLgk (lgk, lagerID) SELECT lgk, lagerID FROM mpi_lagerort WHERE lgk NOT LIKE '' AND lgk IS NOT NULL AND lgk != '--'; INSERT INTO con_lagerLgk (lgk, lagerID) SELECT lgk, lagerID FROM mpi_lagerort WHERE lgk NOT LIKE '' AND lgk IS NOT NULL AND lgk != '--';
...@@ -335,7 +276,7 @@ END IF; ...@@ -335,7 +276,7 @@ END IF;
-- CHANGES V1.1.08 - 2016-04-18 -- CHANGES V1.1.08 - 2016-04-18
-- **************************** -- ****************************
-- fs::rsync -- fs::rsync - anpassungen fuer lieferID
-- db::mpi_ablage - change foreign key to set null -- db::mpi_ablage - change foreign key to set null
-- db::mpi_bestell - change lieferant to lieferID -- db::mpi_bestell - change lieferant to lieferID
-- db::mpi_lieferant - change tabID to lieferID -- db::mpi_lieferant - change tabID to lieferID
...@@ -365,11 +306,190 @@ END IF; ...@@ -365,11 +306,190 @@ END IF;
ALTER TABLE mpi_ablage ADD CONSTRAINT mpi_liefer_lieferID FOREIGN KEY (lieferID) REFERENCES mpi_lieferant (lieferID) ON DELETE SET NULL ON UPDATE RESTRICT ; ALTER TABLE mpi_ablage ADD CONSTRAINT mpi_liefer_lieferID FOREIGN KEY (lieferID) REFERENCES mpi_lieferant (lieferID) ON DELETE SET NULL ON UPDATE RESTRICT ;
TRUNCATE dataface__version; TRUNCATE dataface__version;
INSERT INTO dataface__version (version) VALUES ('1108'); INSERT INTO dataface__version (version) VALUES ('1108');
END IF; END IF;
-- CHANGES V1.1.09 - 2016-04-25
-- ****************************
-- fs::rsync - asi policy view BA und SDB
-- db::view_chemALL - add BA und SDB anderer gruppen
IF ( SELECT MAX(version) FROM dataface__version ) < '1109' THEN
-- change view_chemAll - mpg-version - evtl. erweitern
CREATE OR REPLACE VIEW view_chemAll AS
SELECT
mpg.tabID AS tabID,
mpg.substanz AS substanz,
mpg.reinheit AS reinheit,
mpg.lgk AS lgk,
mpg.cmr AS cmr,
mpg.cas AS cas,
mpg.einheit AS einheit,
LPAD(mpg.bFileID, 6, '0') AS bFileID,
(SELECT file_filename FROM mpidb_mpg_chem.mpi_ablage WHERE mpg.bFileID = ablageID) AS bFilename,
LPAD(mpg.sFileID, 6, '0') AS sFileID,
(SELECT file_filename FROM mpidb_mpg_chem.mpi_ablage WHERE mpg.sFileID = ablageID) AS sFilename,
'mpg' AS gruppe,
mpg.bearbeiter AS bearbeiter,
mpg.zeitstempel AS zeitstempel
FROM mpidb_mpg_chem.mpi_chemstoff AS mpg
;
TRUNCATE dataface__version;
INSERT INTO dataface__version (version) VALUES ('1109');
END IF;
-- CHANGES V1.1.10 - 2016-04-28
-- ****************************
-- fs::mpi_unterweisung - change mpi_unterweisung
-- db::mpi_unterweisung - change mpi_unterweisung
-- db::list_nutzer - change autoID zu nutzerID
-- db::con_chemNutzer - add new table
IF ( SELECT MAX(version) FROM dataface__version ) < '1110' THEN
-- mpi_unterweisung anpassen
ALTER TABLE mpi_unterweisung CHANGE bemerkung bemerkung VARCHAR(100) NULL ;
ALTER TABLE mpi_unterweisung ADD nutzerID SMALLINT(6) UNSIGNED ZEROFILL NULL AFTER uweisID , ADD INDEX (nutzerID) ;
ALTER TABLE list_nutzer CHANGE autoID nutzerID SMALLINT(6) UNSIGNED ZEROFILL NOT NULL AUTO_INCREMENT ;
ALTER TABLE mpi_unterweisung ADD CONSTRAINT nutzer_unterw_nutzerID FOREIGN KEY (nutzerID) REFERENCES list_nutzer (nutzerID
) ON DELETE CASCADE ON UPDATE RESTRICT ;
UPDATE mpi_unterweisung AS unt SET unt.nutzerID = (SELECT nutzerID FROM list_nutzer WHERE nutzer = unt.nutzer), zeitstempel = zeitstempel WHERE unt.nutzer IS NOT NULL ;
ALTER TABLE mpi_unterweisung DROP FOREIGN KEY mpi_unterweisung_ibfk_2 ;
ALTER TABLE mpi_unterweisung DROP nutzer ;
ALTER TABLE mpi_unterweisung CHANGE nutzerID nutzerID SMALLINT(6) UNSIGNED ZEROFILL NOT NULL ;
ALTER TABLE mpi_unterweisung CHANGE ablageID ablageID SMALLINT(6) UNSIGNED ZEROFILL NOT NULL ;
ALTER TABLE mpi_unterweisung ADD UNIQUE KEY nutzer_ablage_datum (nutzerID,ablageID,datum) ;
-- add table con_chemNutzer
CREATE TABLE IF NOT EXISTS con_chemNutzer (
conID smallint(6) unsigned zerofill NOT NULL AUTO_INCREMENT,
chemID smallint(6) NOT NULL,
nutzerID smallint(6) unsigned zerofill NOT NULL,
PRIMARY KEY (conID),
UNIQUE KEY chem_nutzer (chemID,nutzerID),
KEY nutzerID (nutzerID),
KEY chemID (chemID)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
ALTER TABLE con_chemNutzer
ADD CONSTRAINT con_chemNutzer_nutzerID FOREIGN KEY (nutzerID) REFERENCES list_nutzer (nutzerID) ON DELETE CASCADE,
ADD CONSTRAINT con_chemNutzer_chemID FOREIGN KEY (chemID) REFERENCES mpi_chemstoff (tabID) ON DELETE CASCADE;
INSERT IGNORE INTO con_chemNutzer (chemID,nutzerID) SELECT chem.tabID AS chemID, nut.nutzerID AS nutzerID FROM mpi_chemstoff AS chem LEFT JOIN list_nutzer AS nut ON chem.nutzer = nut.nutzer WHERE chem.nutzer IS NOT NULL AND chem.nutzer != '--' ;
INSERT IGNORE INTO list_reiter (reiter, kategorie, favorit, history, bedeutung) VALUES ('con_chemNutzer','Zuordnung','0','0','Mehrfachverbindung Chemiestoff-Nutzer');
ALTER TABLE mpi_chemstoff DROP FOREIGN KEY mpi_chemstoff_ibfk_4 ;
ALTER TABLE mpi_chemstoff DROP nutzer ;
DELETE FROM list_nutzer WHERE nutzer = '--' ;
-- view ausfuehren wegen del nutzer
CREATE OR REPLACE VIEW view_chemstoff AS
SELECT
chem.*,
vfluss.anzahl AS anzahl,
(SELECT LPAD(lagerID,6,'0') FROM mpi_lagerort WHERE lagerID = vfluss.lagerID) AS lagerID
FROM
mpi_chemstoff AS chem
LEFT JOIN view_mengenfluss as vfluss ON vfluss.chemID = chem.tabID
WHERE
vfluss.anzahl IS NOT NULL
ORDER BY
substanz, reinheit, einheit, lagerID
;
TRUNCATE dataface__version;
INSERT INTO dataface__version (version) VALUES ('1110');
END IF;
-- CHANGES V1.1.11 - 2016-04-29
-- ****************************
-- fs::con_ablageBest - new table
-- fs::con_ablageLief - new table
-- db::view_ablageALL - alle duerfen BA und SDB anderer gruppen sehen
-- db::con_ablageBest - new table
-- db::con_ablageLief - new table
-- db::list_reiter - add table view_ablageAll
IF ( SELECT MAX(version) FROM dataface__version ) < '1111' THEN
-- view_ablageALL - alle duerfen BA und SDB anderer gruppen sehen
CREATE OR REPLACE VIEW view_ablageAll AS
SELECT
LPAD(mpg.ablageID, 6, '0') AS ablageID,
mpg.kategorie AS kategorie,
mpg.bezeichnung AS bezeichnung,
mpg.file_filename AS filename,
'mpg' AS gruppe,
mpg.bearbeiter AS bearbeiter,
mpg.zeitstempel AS zeitstempel
FROM
mpidb_mpg_chem.mpi_ablage AS mpg
WHERE
mpg.kategorie = 'Betriebsanweisung' OR mpg.kategorie = 'Sicherheitsdatenblatt'
ORDER BY
filename
;
-- new m:n table bestell-ablage
CREATE TABLE IF NOT EXISTS con_ablageBest (
conID smallint(6) unsigned zerofill NOT NULL AUTO_INCREMENT,
ablageID smallint(6) unsigned zerofill NOT NULL,
bestellID smallint(6) unsigned zerofill NOT NULL,
PRIMARY KEY (conID),
UNIQUE KEY ablage_bestell (ablageID,bestellID),
KEY bestellID (bestellID),
KEY ablageID (ablageID)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
ALTER TABLE con_ablageBest
ADD CONSTRAINT conAblBest_bestell_ID FOREIGN KEY (bestellID) REFERENCES mpi_bestell (bestellID) ON DELETE CASCADE ,
ADD CONSTRAINT conAblBest_ablage_ID FOREIGN KEY (ablageID) REFERENCES mpi_ablage (ablageID) ON DELETE CASCADE ;
INSERT con_ablageBest (ablageID, bestellID) SELECT ablageID, bestellID FROM mpi_ablage WHERE ablageID IS NOT NULL AND bestellID IS NOT NULL ;
-- new m:n table liefer-ablage
CREATE TABLE IF NOT EXISTS con_ablageLief (
conID smallint(6) unsigned zerofill NOT NULL AUTO_INCREMENT,
ablageID smallint(6) unsigned zerofill NOT NULL,
lieferID smallint(6) unsigned zerofill NOT NULL,
PRIMARY KEY (conID),
UNIQUE KEY ablage_liefer (ablageID,lieferID),
KEY lieferID (lieferID),
KEY ablageID (ablageID)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
ALTER TABLE con_ablageLief
ADD CONSTRAINT conAblLief_liefer_ID FOREIGN KEY (lieferID) REFERENCES mpi_lieferant (lieferID) ON DELETE CASCADE ,
ADD CONSTRAINT conAblLief_ablage_ID FOREIGN KEY (ablageID) REFERENCES mpi_ablage (ablageID) ON DELETE CASCADE ;
INSERT con_ablageLief (ablageID, lieferID) SELECT ablageID, lieferID FROM mpi_ablage WHERE ablageID IS NOT NULL AND lieferID IS NOT NULL ;
-- add tables in list_reiter
INSERT IGNORE INTO list_reiter (reiter, kategorie, favorit, history, bedeutung) VALUES ('view_ablageAll', 'View', '1', '0', 'Betriebsanw. und Sicherh.-Datenbl. andere Gruppen');
INSERT IGNORE INTO list_reiter (reiter, kategorie, favorit, history, bedeutung) VALUES ('con_ablageBest','Zuordnung','0','0','Mehrfachverbindung Ablage-Bestellnr.');
INSERT IGNORE INTO list_reiter (reiter, kategorie, favorit, history, bedeutung) VALUES ('con_ablageLief','Zuordnung','0','0','Mehrfachverbindung Ablage-Lieferant');
-- change foreign key name
ALTER TABLE mpi_bestell DROP FOREIGN KEY mpi_lieferant_lieferID ;
ALTER TABLE mpi_bestell ADD CONSTRAINT bestell_lieferant_ID FOREIGN KEY (lieferID) REFERENCES mpi_lieferant (lieferID) ON DELETE CASCADE ON UPDATE RESTRICT ;
-- del fields bestell, liefer in ablage
ALTER TABLE mpi_ablage DROP FOREIGN KEY mpi_bestell_bestellID ;
ALTER TABLE mpi_ablage DROP bestellID ;
ALTER TABLE mpi_ablage DROP FOREIGN KEY mpi_liefer_lieferID ;
ALTER TABLE mpi_ablage DROP lieferID ;
TRUNCATE dataface__version;
INSERT INTO dataface__version (version) VALUES ('1111');
END IF;
......
tables/con_ablage/actions.ini 0 → 100644
+ 20
− 0
View file @ c3895b16
[view_entry]
label="Details Ablage [{$record->val('conID')}]"
icon = "images/show.png"
url="{$site_href}?-action=browse&-table=con_ablage&conID={$record->val('conID')}"
url_condition="$record"
condition="$record and $query['-table'] == 'con_ablage'"
permission=view
category=list_row_actions
order = 10
[edit_entry]
label="Bearbeite Ablage [{$record->val('conID')}]"
icon = "images/edit.png"
url="{$site_href}?-action=edit&-table=con_ablage&conID={$record->val('conID')}"
url_condition="$record"
condition="$record and $query['-table'] == 'con_ablage'"
permission=edit
category=list_row_actions
order = 20
tables/con_ablage/con_ablage.php 0 → 100644
+ 101
− 0
View file @ c3895b16
<?php
class tables_con_ablage {
// setze indiv. Farbe in listenansicht fuer tabelle
function css__tableRowClass( &$record ) {
$query = Dataface_Application::getInstance()->getQuery();
$table = $query['-table'].' ';
// return $table.'normal'; //mit color
return $table; // ohne color
}
// glanceview
function getTitle(&$record) {
//return $record->strval('kategorie').' : '.$record->strval('ablage.file_filename');
//return $record->display('ablageID');
return $record->display('conID').' : '.$record->display('ablageID');
}
function ablageID__renderCell( &$record ) {
$table = 'mpi_ablage';
$action = 'browse';
$field = 'ablageID';
$tabID = $record->val($field);
$name = $record->display($field);
//$name = $record->strval('ablage.file_filename'); // dauert extrem lange
$url = DATAFACE_SITE_HREF."?-table=${table}&-action=${action}&${field}=${tabID}";
return '<div style="text-align:left;"><a href="'.$url.'">'.$name.'</a></div>';
}
function anlID__renderCell( &$record ) {
$table = 'mpi_anlagen';
$action = 'browse';
$field = 'tabID';
$tabID = $record->val('anlID');
$name = $record->display('anlID');
$url = DATAFACE_SITE_HREF."?-table=${table}&-action=${action}&${field}=${tabID}";
return '<div style="text-align:left;"><a href="'.$url.'">'.$name.'</a></div>';
}
function gerID__renderCell( &$record ) {
$table = 'mpi_geraete';
$action = 'browse';
$field = 'tabID';
$tabID = $record->val('gerID');
$name = $record->display('gerID');
$url = DATAFACE_SITE_HREF."?-table=${table}&-action=${action}&${field}=${tabID}";
return '<div style="text-align:left;"><a href="'.$url.'">'.$name.'</a></div>';
}
function matID__renderCell( &$record ) {
$table = 'mpi_material';
$action = 'browse';
$field = 'tabID';
$tabID = $record->val('matID');
$name = $record->display('matID');
$url = DATAFACE_SITE_HREF."?-table=${table}&-action=${action}&${field}=${tabID}";
return '<div style="text-align:left;"><a href="'.$url.'">'.$name.'</a></div>';
}
function lieferID__renderCell( &$record ) {
$table = 'mpi_lieferant';
$action = 'browse';
$field = 'lieferID';
$tabID = $record->val($field);
$name = $record->display($field);
$url = DATAFACE_SITE_HREF."?-table=${table}&-action=${action}&${field}=${tabID}";
return '<div style="text-align:left;"><a href="'.$url.'">'.$name.'</a></div>';
}
function gasID__renderCell( &$record ) {
$table = 'mpi_gasflaschen';
$action = 'browse';
$field = 'gasID';
$tabID = $record->val($field);
$name = $record->display($field);
$url = DATAFACE_SITE_HREF."?-table=${table}&-action=${action}&${field}=${tabID}";
return '<div style="text-align:left;"><a href="'.$url.'">'.$name.'</a></div>';
}
/*
// behindert manchmal, wird eh per cron wieder geloescht, wenn leer
function beforeSave(&$record) {
if ($record->val('anlID') != NULL) return;
if ($record->val('gerID') != NULL) return;
if ($record->val('matID') != NULL) return;
if ($record->val('lieferID') != NULL) return;
if ($record->val('gasID') != NULL) return;
return Dataface_Error::permissionDenied('Wenigstens eine Zuordnung sollte es schon geben!');
}
*/
// Zeitanzeige aendern
function zeitstempel__display(&$record) {
if ($record->val('zeitstempel') == NULL) return;
return date('d.m.Y', strtotime($record->strval('zeitstempel')));
}
}
?>
tables/con_ablage/fields.ini 0 → 100644
+ 107
− 0
View file @ c3895b16
#__sql__ = "SELECT con.*, abl.kategorie, abl.bearbeiter, abl.zeitstempel FROM con_ablage AS con LEFT JOIN mpi_ablage AS abl ON con.ablageID = abl.ablageID"
#__sql__ = "SELECT con.*, abl.kategorie, abl.bearbeiter, abl.zeitstempel, ger.art FROM con_ablage AS con LEFT JOIN mpi_ablage AS abl ON con.ablageID = abl.ablageID LEFT JOIN mpi_geraete AS ger ON con.gerID = ger.tabID"
__sql__ = "SELECT con.*, abl.kategorie, abl.bearbeiter, abl.zeitstempel, ger.art FROM con_ablage AS con LEFT JOIN mpi_ablage AS abl ON con.ablageID = abl.ablageID LEFT JOIN mpi_geraete AS ger ON con.gerID = ger.tabID"
[__global__]
noLinkFromListView = 1
[conID]
noLinkFromListView = 0
#widget:type = "hidden"
#visibility:list = "hidden"
#visibility:browse = "hidden"
visibility:find = "hidden"
order = 1
[kategorie]
transient = 1
widget:type = select
vocabulary = katAblage
widget:label = "Kategorie"
column:legend = "Ablage"
widget:description = "Auswahlfilter Ablagen"
filter = 1
order = 10
[ablageID]
widget:type = depselect
widget:table = mpi_ablage
widget:label = "Ablage"
column:legend = "Link"
widget:description = "Für eine neue Datei nutze Reiter 'ablage' oder Plus-Icon (Bug: F5 zum schliessen des Fensters)"
widget:filters:kategorie = "$kategorie|"
#widget:filters:kategorie = "$kategorie"
widget:filters:-sort = "file_filename"
vocabulary = ablage
# ohne limit auf 250 gekuerzt!
widget:limit = 8092
filter = 1
order = 20
[anlID]
widget:type = select
widget:label = "Anlage"
column:legend = "Link"
widget:description = "Nur mit auswählen, wenn auch eine Beziehung besteht"
vocabulary = anlage
#filter = 1
order = 30
[art]
transient = 1
widget:type = select
vocabulary = art
widget:label = "Art"
column:legend = "Gerät"
widget:description = "Auswahlfilter Geräte"
filter = 1
order = 35
[gerID]
order = 40
widget:type = depselect
widget:table = mpi_geraete
widget:label = "Gerät"
column:legend = "Link"
widget:description = "Nur mit auswählen, wenn auch eine Beziehung besteht"
widget:filters:art = "$art|"
#widget:filters:anlID = "$anlID|"
widget:filters:-sort = "name"
vocabulary = geraet
# ohne limit auf 250 gekuerzt!
widget:limit = 8092
[matID]
widget:type = select
widget:label = "Material"
column:legend = "Link"
widget:description = "Nur mit auswählen, wenn auch eine Beziehung besteht"
vocabulary = material
#filter = 1
order = 50
[lieferID]
widget:type = "select"
widget:label = "Lieferant"
column:legend = "Link"
widget:description = "Nur mit auswählen, wenn auch eine Beziehung besteht"
vocabulary = lieferant
#filter = 1
order = 60
[gasID]
widget:type = "select"
widget:label = "Gasflasche"
column:legend = "Link"
widget:description = "Nur mit auswählen, wenn auch eine Beziehung besteht"
vocabulary = gasflaschen
#filter = 1
order = 70
[bearbeiter]
widget:type = "static"
order = 80
[zeitstempel]
order = 90
tables/con_ablage/relationships.ini 0 → 100644
+ 36
− 0
View file @ c3895b16
[ablage]
mpi_ablage.ablageID = "$ablageID"
action:visible = 0
actions:addnew = 0
action:order = 10
[anlagen]
mpi_anlagen.tabID = "$anlID"
action:visible = 0
actions:addnew = 0
action:order = 20
[geraete]
mpi_geraete.tabID = "$gerID"
action:visible = 0
actions:addnew = 0
action:order = 30
[material]
mpi_material.tabID = "$matID"
action:visible = 0
actions:addnew = 0
action:order = 40
[lieferant]
mpi_lieferant.lieferID = "$lieferID"
action:visible = 0
actions:addnew = 0
action:order = 50
[gasflaschen]
mpi_gasflaschen.gasID = "$gasID"
action:visible = 0
actions:addnew = 0
action:order = 60
tables/con_ablage/valuelists.ini 0 → 120000
+ 1
− 0
View file @ c3895b16
../valuelists.ini
\ No newline at end of file
tables/con_ablageBest/con_ablageBest.php 0 → 100644
+ 17
− 0
View file @ c3895b16
<?php
class tables_con_ablageBest {
// setze Farbe in listenansicht entsprechend Minwert zu Menge
function css__tableRowClass( &$record ) {
return 'mpi_ablage ';
}
function getTitle(&$record) {
//return $record->val('conID');
return $record->display('ablageID').' - '.$record->display('bestellID');
//return $record->val('conID').' (chemID='.$record->val('chemID').')';
}
}
?>
tables/con_ablageBest/fields.ini 0 → 100644
+ 46
− 0
View file @ c3895b16
__sql__ = "SELECT con.*, abl.kategorie FROM con_ablageBest AS con LEFT JOIN mpi_ablage AS abl ON con.ablageID = abl.ablageID"
[__global__]
noLinkFromListView = 1
[conID]
noLinkFromListView = 0
#widget:type = "hidden"
#visibility:list = "hidden"
#visibility:browse = "hidden"
#visibility:find = "hidden"
order = 10
[kategorie]
#transient = 1
widget:type = select
vocabulary = katAblage
filter = 1
order = 20
[ablageID]
widget:type = depselect
vocabulary = filename
widget:table = mpi_ablage
widget:label = "Ablage"
widget:description = "Zuordnung Ablage zur Bestellnummer"
widget:filters:kategorie = "$kategorie|"
widget:filters:-sort = "file_filename"
widget:limit = 8092
#filter = 1
order = 30
[bestellID]
widget:type = depselect
vocabulary = bestell
widget:table = mpi_bestell
widget:label = "Bestellnummer"
widget:description = "Zuordnung Bestellnummer zur Ablage"
#widget:filters:lieferID = "$lieferID|"
#widget:filters:-sort = "bestellnummer"
# ohne limit auf 250 gekuerzt!
widget:limit = 8092
filter = 1
order = 40
tables/con_ablageBest/relationships.ini 0 → 100644
+ 10
− 0
View file @ c3895b16
[ablage]
mpi_ablage.ablageID = "$ablageID"
#mpi_ablage.kategorie = "Zertifikat"
#action:visible = 0
action:order = 10
[bestellnummer]
mpi_bestell.bestellID = "$bestellID"
#action:visible = 0
action:order = 20
tables/con_ablageBest/valuelists.ini 0 → 120000
+ 1
− 0
View file @ c3895b16
../valuelists.ini
\ No newline at end of file
tables/con_ablageLief/con_ablageLief.php 0 → 100644
+ 16
− 0
View file @ c3895b16
<?php
class tables_con_ablageLief {
// setze Farbe in listenansicht entsprechend Minwert zu Menge
function css__tableRowClass( &$record ) {
return 'mpi_lieferant ';
}
function getTitle(&$record) {
//return $record->val('conID');
return $record->display('ablageID').' - '.$record->display('lieferID');
}
}
?>
tables/con_ablageLief/fields.ini 0 → 100644
+ 45
− 0
View file @ c3895b16
__sql__ = "SELECT con.*, abl.kategorie FROM con_ablageLief AS con LEFT JOIN mpi_ablage AS abl ON con.ablageID = abl.ablageID"
[__global__]
noLinkFromListView = 1
[conID]
noLinkFromListView = 0
#widget:type = "hidden"
#visibility:list = "hidden"
#visibility:browse = "hidden"
#visibility:find = "hidden"
order = 10
[kategorie]
widget:type = select
vocabulary = katAblage
filter = 1
order = 20
[ablageID]
widget:type = depselect
vocabulary = filename
widget:table = mpi_ablage
widget:label = "Ablage"
widget:description = "Zuordnung Ablage zum Lieferanten"
widget:filters:kategorie = "$kategorie|"
widget:filters:-sort = "file_filename"
widget:limit = 8092
#filter = 1
order = 30
[lieferID]
widget:type = depselect
vocabulary = lieferant
widget:table = mpi_lieferant
widget:label = "Lieferant"
widget:description = "Zuordnung Lieferant zur Ablage"
#widget:filters:lieferID = "$lieferID|"
widget:filters:-sort = "lieferant"
# ohne limit auf 250 gekuerzt!
widget:limit = 8092
filter = 1
order = 40
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment