diff --git a/sql/v01/20.view.sql b/sql/v01/20.view.sql index bbd3bb3..b057925 100644 --- a/sql/v01/20.view.sql +++ b/sql/v01/20.view.sql @@ -23,6 +23,8 @@ SELECT p.year, p.did, p.dpnr, d.date, d.time, d.zwstid, d.lnr, d.lsnr, m.mgnr, m.family_name, m.given_name, p.sortid, p.weight, p.kmw, ROUND(p.kmw * (4.54 + 0.022 * p.kmw), 0) AS oe, p.qualid, p.hkid, p.kgnr, p.rdnr, + p.qualid NOT IN (SELECT l.qualid FROM wine_quality_level l WHERE p.kmw >= l.min_kmw OR l.min_kmw IS NULL) AS abgewertet, + p.qualid NOT IN ('WEI', 'RSW', 'LDW') AS min_quw, GROUP_CONCAT(DISTINCT a.attrid) as attributes, GROUP_CONCAT(DISTINCT o.modid) as modifiers, d.comment, p.comment as part_comment FROM delivery_part p @@ -33,6 +35,14 @@ FROM delivery_part p GROUP BY p.year, p.did, p.dpnr ORDER BY p.year, p.did, p.dpnr; +CREATE VIEW v_bucket AS +SELECT year, mgnr, + sortid || IIF(min_quw, REPLACE(COALESCE(attributes, ''), ',', ''), '_') AS bucket, + SUM(weight) AS weight +FROM v_delivery +GROUP BY year, mgnr, bucket +ORDER BY year, mgnr, LENGTH(bucket) DESC, bucket; + CREATE VIEW v_stat_season AS SELECT year, SUM(weight) AS sum, diff --git a/tt/HIL.csv b/tt/HIL.csv index f015dcc..df19ea2 100644 --- a/tt/HIL.csv +++ b/tt/HIL.csv @@ -2,7 +2,7 @@ date,from,to,hours,category,name 2022-10-13,09:00,12:00,3,assessment,Ersteinschätzung WG Master in Matzen 2022-10-31,16:00,18:00,2,assessment,Erstes Treffen mit Christian Perschl 2022-10-31,22:00,01:00,3,structure,Projektstruktur -2022-11-14,22:00,23:30,1.5,export,VBA Export +2022-11-14,22:00,23:30,1.5,wgexport,VBA Export 2022-11-15,15:30,21:30,6,database,ER Diagram 2022-12-02,13:00,15:30,2.5,meeting,Kickoff Meeting 2023-02-04,23:45,01:00,1.25,structure,Projekt Setup diff --git a/tt/STE.csv b/tt/STE.csv index b3f7cd6..975fa19 100644 --- a/tt/STE.csv +++ b/tt/STE.csv @@ -9,8 +9,8 @@ date,from,to,hours,category,name 2022-11-06,20:30,21:00,0.5,wpf,Dialog Bankverbindung 2022-11-08,10:30,11:30,1,structure,Gradation 2022-11-10,17:00,18:00,1,database,Herkunftsbezeichnungen -2022-11-14,22:00,23:30,1.5,export,VBA Export -2022-11-15,11:00,12:00,1,export,WGdaten export +2022-11-14,22:00,23:30,1.5,wgexport,VBA Export +2022-11-15,11:00,12:00,1,wgexport,WGdaten export 2022-11-15,15:30,21:30,6,database,ER Diagram 2022-11-27,21:00,22:00,1,database,Extract PLZ 2022-12-02,13:00,15:30,2.5,meeting,Kickoff Meeting @@ -18,7 +18,7 @@ date,from,to,hours,category,name 2023-02-04,22:00,01:00,3,database,Mitglieder 2023-02-06,11:00,13:00,2,database,Mitglieder/Kataster 2023-02-08,22:00,23:30,1.5,database,Flächenbindungen -2023-02-09,17:00,18:00,1,export,wgexport.py +2023-02-09,17:00,18:00,1,wgexport,wgexport.py 2023-02-13,15:00,18:00,3,database,Lieferungen 2023-02-15,17:00,18:00,1,database,Abrechnung 2023-02-16,17:00,19:00,2,database,Abrechnung @@ -88,7 +88,7 @@ date,from,to,hours,category,name 2023-04-28,11:00,12:45,1.75,database,Mandanten Parameter 2023-04-28,16:15,18:30,2.25,database,ctime/mtime 2023-04-29,00:30,01:30,1,database,ctime/mtime -2023-04-30,11:00,12:00,1,export,accdb file search +2023-04-30,11:00,12:00,1,wgexport,accdb file search 2023-04-03,09:15,10:00,0.75,meeting,Treffen mit Leo 2023-05-04,22:00,23:30,1.5,import,csv change 2023-05-13,13:00,14:00,1,wpf,Entity Framework @@ -132,3 +132,8 @@ date,from,to,hours,category,name 2023-08-19,16:30,00:00,7.5,wpf,DeliveryAdminWindow filtering/statusbar 2023-08-23,13:30,16:00,2.5,wpf,AreaComAdminWindow adjust new db schema 2023-08-23,16:00,17:00,1,migrate,Auszahlung +2023-08-24,15:00,18:00,3,wpf,DeliveryAdminWindow fixes +2023-08-26,19:00,21:00,2,wpf,AbwertenDialog +2023-08-28,22:00,01:30,3.5,wpf,DeliveryExtractionDialog +2023-08-29,11:00,12:15,1.25,export,ELBA/EBICS format specifications +2023-08-29,14:30,15:30,1,database,Add v_bucket