Commit 71dc5d7f authored by Gerd Schachtschneider's avatar Gerd Schachtschneider
Browse files

update sortierung

parent 32aae58c
../master/conf2/
\ No newline at end of file
......@@ -11,7 +11,8 @@ title = "Gefahrenmerkmale"
;debug = 1
default_language = de
;default_browse_action = edit
;default_table = mpi_users#
;default_table = mpi_users
default_limit = 25
;usage_mode = edit
disable_session_ip_check = 1
disable_g2 = 1
......@@ -34,7 +35,7 @@ driver = "mysqli"
[_own]
dn = "mpi-magdeburg.mpg.de"
notify = 30
version = 1.0.04
version = 1.0.05
mailto = "db-responsable@<domain>.mpg.de"
mailname = "db-admin"
......
......@@ -3,7 +3,7 @@
-- http://www.phpmyadmin.net
--
-- Host: localhost
-- Generation Time: Jun 09, 2016 at 11:48 AM
-- Generation Time: Jun 13, 2016 at 05:41 PM
-- Server version: 5.5.49-0ubuntu0.14.04.1-log
-- PHP Version: 5.5.9-1ubuntu4.17
......@@ -169,6 +169,20 @@ END IF;
IF ( SELECT MAX(version) FROM dataface__version ) < '1005' THEN
TRUNCATE dataface__version;
INSERT INTO dataface__version (version) VALUES ('1005');
END IF;
END$$
DELIMITER ;
......@@ -247,7 +261,7 @@ CREATE TABLE IF NOT EXISTS `dataface__version` (
--
INSERT INTO `dataface__version` (`version`) VALUES
(1004);
(1005);
-- --------------------------------------------------------
......@@ -576,9 +590,9 @@ CREATE TABLE IF NOT EXISTS `view_reiter` (
-- Stand-in structure for view `view_user`
--
CREATE TABLE IF NOT EXISTS `view_user` (
`localID` varchar(25)
,`last_name` varchar(30)
,`first_name` varchar(30)
`localID` varchar(5)
,`last_name` varchar(7)
,`first_name` varchar(3)
);
-- --------------------------------------------------------
......@@ -632,7 +646,7 @@ CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW
--
DROP TABLE IF EXISTS `view_user`;
CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `view_user` AS select `mpidb_mpg_user`.`mpi_user`.`localID` AS `localID`,`mpidb_mpg_user`.`mpi_user`.`last_name` AS `last_name`,`mpidb_mpg_user`.`mpi_user`.`first_name` AS `first_name` from `mpidb_mpg_user`.`mpi_user` where (`mpidb_mpg_user`.`mpi_user`.`active` = 1) order by `mpidb_mpg_user`.`mpi_user`.`localID`;
CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `view_user` AS select 'local' AS `localID`,'version' AS `last_name`,'mpg' AS `first_name` order by 'local';
--
-- Constraints for dumped tables
......
......@@ -149,6 +149,20 @@ END IF;
END IF;
-- CHANGES V1.0.05 - 2016-06-13
-- ****************************
-- fs::conf - link nach master geloescht, Sortierung von fields.ini nach ApplicationDelegate.php
-- fs::fields.ini - sql order raus
IF ( SELECT MAX(version) FROM dataface__version ) < '1005' THEN
-- nur file version
TRUNCATE dataface__version;
INSERT INTO dataface__version (version) VALUES ('1005');
END IF;
END;
$$
......
; sortierung nach software, statt in index.php
__sql__ = "SELECT * FROM list_gefahr ORDER BY hsatz"
; ORDER BY hsatz
[__global__]
noLinkFromListView = 1
......
__sql__ = "SELECT vGef.*, lGef.cmr, lGef.anweisung, lGef.lgk FROM view_gefahr AS vGef LEFT JOIN list_gefahr AS lGef ON lGef.kategorie = vGef.kategorie ORDER BY zeitstempel DESC, vGef.tabID, lGef.hsatz"
__sql__ = "SELECT vGef.*, lGef.cmr, lGef.anweisung, lGef.lgk FROM view_gefahr AS vGef LEFT JOIN list_gefahr AS lGef ON lGef.kategorie = vGef.kategorie"
; ORDER BY kategorie, substanz
[__global__]
noLinkFromListView = 1
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment