3 Angajamente 9eb59ecb4b ... a9fcc454fc

Autor SHA1 Permisiunea de a trimite mesaje. Dacă este dezactivată, utilizatorul nu va putea trimite nici un fel de mesaj Data
  Rüschkamp a9fcc454fc GCStarter 11 luni în urmă
  Rüschkamp 69c37dcecd Anpassungen Rüschkamp 11 luni în urmă
  Rüschkamp 5e1a23184a Impromptu und db-run system-unabhängig, Transformer mit hinterlegtem Passwort 11 luni în urmă
38 a modificat fișierele cu 314 adăugiri și 424 ștergeri
  1. 3 15
      GCStarter/config/gcstarter.xml
  2. BIN
      System/LOCOSOFT/IQD/Belege/LOC_Belege_ohne_Abschlussbuchung.imr
  3. BIN
      System/LOCOSOFT/IQD/Belege/current_date_Prognose_operativ_VJ-2.imr
  4. 1 1
      System/LOCOSOFT/IQD/Belege/current_date_Prognose_operativ_VJ-2.iqd
  5. 2 17
      System/LOCOSOFT/IQD/Belege/current_date_Prognose_operativ_VJ-2.sql
  6. 0 0
      System/LOCOSOFT/Package/IDLog.xml
  7. 0 0
      System/LOCOSOFT/Package/log.xml
  8. 0 0
      System/LOCOSOFT/Package/model.xml
  9. 116 113
      System/LOCOSOFT/SQL/dtsx/LOCOSOFT_imr_csv.dtsx
  10. 0 15
      System/LOCOSOFT/SQL/schema/GC/tables/data.GC_Activity_Codes.sql
  11. 0 14
      System/LOCOSOFT/SQL/schema/GC/tables/data.GC_Auftragsart.sql
  12. 2 0
      System/LOCOSOFT/SQL/schema/GC/tables/data.GC_Config.sql
  13. 0 11
      System/LOCOSOFT/SQL/schema/GC/tables/data.GC_Fokus_Produktgruppen.sql
  14. 0 11
      System/LOCOSOFT/SQL/schema/GC/tables/data.GC_Geschaeftsbuchungsgruppen.sql
  15. 0 19
      System/LOCOSOFT/SQL/schema/GC/tables/data.GC_Kalender.sql
  16. 0 10
      System/LOCOSOFT/SQL/schema/GC/tables/data.GC_Kundengruppen.sql
  17. 0 11
      System/LOCOSOFT/SQL/schema/GC/tables/data.GC_Task_Type.sql
  18. 0 17
      System/LOCOSOFT/SQL/schema/GC/tables/data.GC_Teams.sql
  19. 0 12
      System/LOCOSOFT/SQL/schema/GC/tables/data.GC_Time_Account.sql
  20. 0 15
      System/LOCOSOFT/SQL/schema/GC/tables/data.GC_Tree.sql
  21. 0 9
      System/LOCOSOFT/SQL/schema/GC/tables/data.GC_Umsatzart.sql
  22. 0 10
      System/LOCOSOFT/SQL/schema/GC/tables/data.GC_Users.sql
  23. 1 1
      System/LOCOSOFT/SQL/schema/GC/tables/locosoft.Zeit_Stempelungen_neu.sql
  24. 1 1
      System/LOCOSOFT/SQL/schema/GC/users/gaps.sql
  25. 0 95
      System/LOCOSOFT/SQL/schema/GC/views/F_Belege_SKR_direkt.sql
  26. 6 0
      System/LOCOSOFT/SQL/schema/LOCOSOFT/schemas.sql
  27. 1 1
      System/LOCOSOFT/SQL/schema/LOCOSOFT/tables/transit_customers.sql
  28. 1 1
      System/LOCOSOFT/SQL/schema/LOCOSOFT/tables/transit_vehicles.sql
  29. 1 1
      System/LOCOSOFT/SQL/schema/LOCOSOFT/users/gaps.sql
  30. 0 1
      System/LOCOSOFT/SQL/schema/LOCOSOFT/views/staging.kontenrahmen_gc_struct_skr_90.sql
  31. 24 0
      System/LOCOSOFT/SQL/schema/LOCOSOFT/views/template.GC_Department.sql
  32. 20 0
      System/LOCOSOFT/SQL/schema/LOCOSOFT/views/template.GC_Marken.sql
  33. 39 0
      System/LOCOSOFT/SQL/schema/LOCOSOFT/views/template.GC_Mitarbeiter.sql
  34. 2 17
      System/LOCOSOFT/SQL/schema/LOCOSOFT/views_imr/staging.current_date_prognose_operativ_vj-2_imr.sql
  35. 87 0
      System/LOCOSOFT/SQL/schema/LOCOSOFT/views_imr/staging.current_date_prognose_vj_imr.sql
  36. 4 4
      Tasks/scripts/Tools/controllers/ImpromptuController.php
  37. 2 1
      Tasks/scripts/db_run.py
  38. 1 1
      Tasks/scripts/transformer11.bat

+ 3 - 15
GCStarter/config/gcstarter.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <GCStarter xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xsi:noNamespaceSchemaLocation="http://dev.global-cube.de/GCStarter.xsd" AutomatischAktualisieren="false">
-  <Webservice>http://10.54.54.10:8091/</Webservice>
+  <Webservice>http://10.54.30.65:8091/</Webservice>
   <Dateigruppen>
     <Dateigruppe Dateiname="Kontenzuordnung GAPS.csv">
       <Dateien>
@@ -47,7 +47,7 @@
       <Zeile>
         <Programm>
           <Name>Global Cube BI</Name>
-          <Pfad>http://10.54.54.10:9300/bi/</Pfad>
+          <Pfad>http://10.54.30.65:9300/bi/</Pfad>
         </Programm>
         <Programm>
           <Name>Kontenzuordnung GAPS</Name>
@@ -57,19 +57,7 @@
       <Zeile>
         <Programm>
           <Name>PC Visit</Name>
-          <Pfad>http://pcvisit.global-cube.de</Pfad>
-        </Programm>
-      </Zeile>
-    </Gruppe>
-    <Gruppe Titel="Aktualisieren">
-      <Zeile>
-        <Programm>
-          <Name>Finanzen          aktualisieren</Name>
-          <Batch>Finanzen_aktualisieren.bat</Batch>
-        </Programm>
-        <Programm>
-          <Name>GAPS aktualisieren</Name>
-          <Batch>Gaps_aktualisieren.bat</Batch>
+          <Pfad>pcvisit\pcvisit.exe</Pfad>
         </Programm>
       </Zeile>
     </Gruppe>

BIN
System/LOCOSOFT/IQD/Belege/LOC_Belege_ohne_Abschlussbuchung.imr


BIN
System/LOCOSOFT/IQD/Belege/current_date_Prognose_operativ_VJ-2.imr


+ 1 - 1
System/LOCOSOFT/IQD/Belege/current_date_Prognose_operativ_VJ-2.iqd

@@ -31,7 +31,7 @@ from
 	   (@CURRENT_DATE) - INTERVAL '000 00:00:00.000' as c11,
 	   CASE WHEN (T1."datum" BETWEEN TIMESTAMP '2008-01-01 00:00:00.000' AND TIMESTAMP '2008-12-31 00:00:00.000') THEN (252) WHEN (T1."datum" BETWEEN TIMESTAMP '2009-01-01 00:00:00.000' AND TIMESTAMP '2009-12-31 00:00:00.000') THEN (252) WHEN (T1."datum" BETWEEN TIMESTAMP '2010-01-01 00:00:00.000' AND TIMESTAMP '2010-12-31 00:00:00.000') THEN (253) WHEN (T1."datum" BETWEEN TIMESTAMP '2011-01-01 00:00:00.000' AND TIMESTAMP '2011-12-31 00:00:00.000') THEN (250) WHEN (T1."datum" BETWEEN TIMESTAMP '2012-01-01 00:00:00.000' AND TIMESTAMP '2012-12-31 00:00:00.000') THEN (249) ELSE (250) END as c13
 from "Arbeitstage" T1
-where ((((T1."bundeslaender_id" = '10') and ((od_year(T1."datum")) = ((extract(YEAR FROM ((@CURRENT_DATE) - INTERVAL '000 00:00:00.000'))) - 2))) and (T1."datum" <= ((@CURRENT_DATE) - INTERVAL '000 00:00:00.000'))) or ((((T1."bundeslaender_id" = '10') and ((od_year(T1."datum")) = ((extract(YEAR FROM ((@CURRENT_DATE) - INTERVAL '000 00:00:00.000'))) - 2))) and (T1."datum" <= ((@CURRENT_DATE) - INTERVAL '000 00:00:00.000'))) and (T1."datum" IN (TIMESTAMP '2012-01-01 00:00:00.000',TIMESTAMP '2013-01-01 00:00:00.000',TIMESTAMP '2014-01-01 00:00:00.000',TIMESTAMP '2015-01-01 00:00:00.000',TIMESTAMP '2016-01-01 00:00:00.000',TIMESTAMP '2017-01-01 00:00:00.000'))))
+where ((T1."bundeslaender_id" = '7') and ((od_year(T1."datum")) = ((extract(YEAR FROM ((@CURRENT_DATE) - INTERVAL '000 00:00:00.000'))) - 2)))
 order by c1 asc,c2 asc,c3 asc,c4 asc,c5 asc,c6 asc,c7 asc,c8 asc,c9 asc,c10 asc,c13 asc
 ) D1
 

+ 2 - 17
System/LOCOSOFT/IQD/Belege/current_date_Prognose_operativ_VJ-2.sql

@@ -42,23 +42,8 @@ FROM (
 			END AS "Gesamt Arbeitstage"
 	FROM "Arbeitstage" T1
 	WHERE (
-			(
-				(
-					(T1."bundeslaender_id" = '10')
-					AND ((year(T1."datum")) = ((year(((getdate()) - INTERVAL '000 00:00:00.000'))) - 2))
-					)
-				AND (T1."datum" <= ((getdate()) - INTERVAL '000 00:00:00.000'))
-				)
-			OR (
-				(
-					(
-						(T1."bundeslaender_id" = '10')
-						AND ((year(T1."datum")) = ((year(((getdate()) - INTERVAL '000 00:00:00.000'))) - 2))
-						)
-					AND (T1."datum" <= ((getdate()) - INTERVAL '000 00:00:00.000'))
-					)
-				AND (T1."datum" IN (convert(DATETIME, '2012-01-01 00:00:00.000'), convert(DATETIME, '2013-01-01 00:00:00.000'), convert(DATETIME, '2014-01-01 00:00:00.000'), convert(DATETIME, '2015-01-01 00:00:00.000'), convert(DATETIME, '2016-01-01 00:00:00.000'), convert(DATETIME, '2017-01-01 00:00:00.000')))
-				)
+			(T1."bundeslaender_id" = '7')
+			AND ((year(T1."datum")) = ((year(((getdate()) - INTERVAL '000 00:00:00.000'))) - 2))
 			)
 		-- order by "Bundeslaender Id" asc,"Datum" asc,"Wochentage Id" asc,"Arbeitstag Mofr" asc,"Zaehler Mofr" asc,"Summe Mofr" asc,"Arbeitstag Mosa" asc,"Zaehler Mosa" asc,"Summe Mosa" asc,"Feiertage Id" asc,"Gesamt Arbeitstage" asc
 	) D1

Fișier diff suprimat deoarece este prea mare
+ 0 - 0
System/LOCOSOFT/Package/IDLog.xml


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
System/LOCOSOFT/Package/log.xml


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
System/LOCOSOFT/Package/model.xml


Fișier diff suprimat deoarece este prea mare
+ 116 - 113
System/LOCOSOFT/SQL/dtsx/LOCOSOFT_imr_csv.dtsx


+ 0 - 15
System/LOCOSOFT/SQL/schema/GC/tables/data.GC_Activity_Codes.sql

@@ -1,15 +0,0 @@
-CREATE TABLE [data].[GC_Activity_Codes] (
-   [Client_DB] [varchar](20) NOT NULL,
-   [Activity_Code] [varchar](20) NOT NULL,
-   [Activity_Desc] [varchar](50) NOT NULL,
-   [Activity_Category] [varchar](20) NOT NULL,
-   [Present] [int] NOT NULL,
-   [Zeitkategorie_1] [varchar](50) NULL,
-   [Zeitkategorie_2] [varchar](50) NULL,
-   [Fabrikat] [varchar](50) NULL
-
-   ,CONSTRAINT [PK_GC_Activity_Codes] PRIMARY KEY CLUSTERED ([Client_DB], [Activity_Code])
-)
-
-
-GO

+ 0 - 14
System/LOCOSOFT/SQL/schema/GC/tables/data.GC_Auftragsart.sql

@@ -1,14 +0,0 @@
-CREATE TABLE [data].[GC_Auftragsart] (
-   [Client_DB] [varchar](20) NOT NULL,
-   [State_Code] [varchar](20) NOT NULL,
-   [State_Specify] [varchar](50) NOT NULL,
-   [Auftagsart] [varchar](20) NULL,
-   [Auftragsstatus] [varchar](20) NULL,
-   [Status_Filter] [int] NOT NULL,
-   [Rechnung_Gutschrift] [varchar](20) NOT NULL
-
-   ,CONSTRAINT [PK_GC_Auftragsart] PRIMARY KEY CLUSTERED ([Client_DB], [State_Code])
-)
-
-
-GO

+ 2 - 0
System/LOCOSOFT/SQL/schema/GC/tables/data.GC_Config.sql

@@ -1,6 +1,8 @@
 CREATE TABLE [data].[GC_Config] (
    [Variable] [varchar](50) NOT NULL,
    [Wert] [varchar](50) NOT NULL
+
+   ,CONSTRAINT [PK_GC_Config] PRIMARY KEY CLUSTERED ([Variable])
 )
 
 

+ 0 - 11
System/LOCOSOFT/SQL/schema/GC/tables/data.GC_Fokus_Produktgruppen.sql

@@ -1,11 +0,0 @@
-CREATE TABLE [data].[GC_Fokus_Produktgruppen] (
-   [Client_DB] [varchar](20) NULL,
-   [Focus_Group] [varchar](50) NULL,
-   [Parts_Number] [varchar](50) NULL,
-   [GMPD_Group] [varchar](20) NULL,
-   [Marke_ID] [varchar](20) NULL,
-   [Marke] [varchar](20) NULL
-)
-
-
-GO

+ 0 - 11
System/LOCOSOFT/SQL/schema/GC/tables/data.GC_Geschaeftsbuchungsgruppen.sql

@@ -1,11 +0,0 @@
-CREATE TABLE [data].[GC_Geschaeftsbuchungsgruppen] (
-   [Client_DB] [varchar](50) NULL,
-   [Geschaeftsbuchungsgruppe] [varchar](50) NOT NULL,
-   [Zuordnung] [varchar](50) NULL,
-   [Beschreibung] [varchar](50) NULL
-
-   ,CONSTRAINT [PK_GC_Geschaeftsbuchungsgruppen] PRIMARY KEY CLUSTERED ([Geschaeftsbuchungsgruppe])
-)
-
-
-GO

+ 0 - 19
System/LOCOSOFT/SQL/schema/GC/tables/data.GC_Kalender.sql

@@ -1,19 +0,0 @@
-CREATE TABLE [data].[GC_Kalender] (
-   [Datum] [date] NOT NULL,
-   [Feiertag_Name] [varchar](30) NULL,
-   [Wochentag_ID] [smallint] NOT NULL,
-   [Wochentag_kurz] [varchar](5) NOT NULL,
-   [Bundesland_Kuerzel] [varchar](5) NOT NULL,
-   [Feiertag] [smallint] NOT NULL,
-   [MoFr] [smallint] NOT NULL,
-   [Vortag_MoFr] [date] NOT NULL,
-   [Monat_MoFr] [smallint] NOT NULL,
-   [Jahr_MoFr] [smallint] NULL,
-   [MoSa] [smallint] NOT NULL,
-   [Vortag_MoSa] [date] NOT NULL,
-   [Monat_MoSa] [smallint] NULL,
-   [Jahr_MoSa] [smallint] NULL
-)
-
-
-GO

+ 0 - 10
System/LOCOSOFT/SQL/schema/GC/tables/data.GC_Kundengruppen.sql

@@ -1,10 +0,0 @@
-CREATE TABLE [data].[GC_Kundengruppen] (
-   [Client_DB] [varchar](20) NOT NULL,
-   [Customer_Group] [varchar](20) NOT NULL,
-   [Description] [varchar](100) NOT NULL,
-   [Umsatzart] [varchar](20) NOT NULL,
-   [Order_By] [int] NOT NULL
-)
-
-
-GO

+ 0 - 11
System/LOCOSOFT/SQL/schema/GC/tables/data.GC_Task_Type.sql

@@ -1,11 +0,0 @@
-CREATE TABLE [data].[GC_Task_Type] (
-   [Client_DB] [nvarchar](255) NULL,
-   [Task Type] [nvarchar](255) NULL,
-   [Beschreibung] [nvarchar](255) NULL,
-   [Activity_Desc] [nvarchar](255) NULL,
-   [Activity_Codes_Group1] [nvarchar](255) NULL,
-   [Activity_Codes_Group2] [nvarchar](255) NULL
-)
-
-
-GO

+ 0 - 17
System/LOCOSOFT/SQL/schema/GC/tables/data.GC_Teams.sql

@@ -1,17 +0,0 @@
-CREATE TABLE [data].[GC_Teams] (
-   [Client_DB] [varchar](20) NOT NULL,
-   [Work_Leader_Group] [varchar](20) NOT NULL,
-   [Work_Leader_Text] [varchar](50) NOT NULL,
-   [Filter] [int] NOT NULL,
-   [Hauptbetrieb_ID] [varchar](20) NULL,
-   [Hauptbetrieb_Name] [varchar](50) NULL,
-   [Betrieb_ID] [varchar](20) NULL,
-   [Standort] [varchar](50) NULL,
-   [Monteurgruppe] [varchar](50) NULL,
-   [Order_By] [int] NOT NULL,
-   [Azubi] [int] NOT NULL,
-   [Produktiv] [int] NOT NULL
-)
-
-
-GO

+ 0 - 12
System/LOCOSOFT/SQL/schema/GC/tables/data.GC_Time_Account.sql

@@ -1,12 +0,0 @@
-CREATE TABLE [data].[GC_Time_Account] (
-   [Client_DB] [nvarchar](255) NULL,
-   [Time_Account] [nvarchar](255) NULL,
-   [Beschreibung] [nvarchar](255) NULL,
-   [Kurzbeschreibung] [nvarchar](255) NULL,
-   [Activity_Desc] [nvarchar](255) NULL,
-   [Activity_Codes_Group1] [nvarchar](255) NULL,
-   [Activity_Codes_Group2] [nvarchar](255) NULL
-)
-
-
-GO

+ 0 - 15
System/LOCOSOFT/SQL/schema/GC/tables/data.GC_Tree.sql

@@ -1,15 +0,0 @@
-CREATE TABLE [data].[GC_Tree] (
-   [ID] [int] NOT NULL,
-   [Tabelle] [varchar](100) NOT NULL,
-   [Struktur] [varchar](100) NOT NULL,
-   [Ebene1] [varchar](100) NOT NULL,
-   [Ebene2] [varchar](100) NOT NULL,
-   [Ebene3] [varchar](100) NOT NULL,
-   [Ebene4] [varchar](100) NOT NULL,
-   [Ebene5] [varchar](100) NOT NULL,
-   [Ebene6] [varchar](100) NOT NULL,
-   [Order_by] [varchar](100) NOT NULL
-)
-
-
-GO

+ 0 - 9
System/LOCOSOFT/SQL/schema/GC/tables/data.GC_Umsatzart.sql

@@ -1,9 +0,0 @@
-CREATE TABLE [data].[GC_Umsatzart] (
-   [Client_DB] [varchar](50) NULL,
-   [Geschaeftsbuchungsgruppe] [varchar](50) NOT NULL,
-   [Zuordnung] [varchar](50) NULL,
-   [Beschreibung] [nvarchar](50) NULL
-)
-
-
-GO

+ 0 - 10
System/LOCOSOFT/SQL/schema/GC/tables/data.GC_Users.sql

@@ -1,10 +0,0 @@
-CREATE TABLE [data].[GC_Users] (
-   [ID] [int] NOT NULL,
-   [User_ID] [varchar](50) NOT NULL,
-   [Password] [varchar](50) NOT NULL,
-   [First_Name] [varchar](50) NOT NULL,
-   [Last_Name] [varchar](50) NOT NULL
-)
-
-
-GO

+ 1 - 1
System/LOCOSOFT/SQL/schema/GC/tables/locosoft.Zeit_Stempelungen_neu.sql

@@ -11,7 +11,7 @@ CREATE TABLE [locosoft].[Zeit_Stempelungen_neu] (
    [Order Number_Times] [varchar](100) NULL,
    [Start Time_Times] [datetime] NULL,
    [Type_Times] [varchar](100) NULL,
-   [Order Positions_Times] [varchar](100) NULL,
+   [Order Positions_Times] [varchar](255) NULL,
    [End Time_Times] [datetime] NULL,
    [Duration Minutes_Times] [varchar](100) NULL,
    [Type_Time_Types] [varchar](100) NULL,

+ 1 - 1
System/LOCOSOFT/SQL/schema/GC/users/gaps.sql

@@ -1,5 +1,5 @@
 IF SUSER_ID('gaps') IS NULL
-				BEGIN CREATE LOGIN gaps WITH PASSWORD = 0x0200B8A773F47B9FF85F6052343339696158705C4600A6DC6E61435C42D3B8FA4BA6566526871FB53A14DF5BC697CC57D2DC95467A300FEF1C8569CFF1CF863FB7243C098359 HASHED END
+				BEGIN CREATE LOGIN gaps WITH PASSWORD = 0x0200B564EAAC5C8AEE9E8F510C2972ADBB14D10AC058294AD865419CC821FDBA939E01679F516CD7B4D5D15C52E56DD2DBFD604C93FB8F81AD86F4087D378F26FB4236CAA468 HASHED END
 CREATE USER [gaps] FOR LOGIN [gaps] WITH DEFAULT_SCHEMA = [dbo]
 /*ALTER ROLE db_ddladmin ADD MEMBER gaps*/ exec sp_addrolemember 'db_ddladmin', 'gaps'
 /*ALTER ROLE db_datareader ADD MEMBER gaps*/ exec sp_addrolemember 'db_datareader', 'gaps'

+ 0 - 95
System/LOCOSOFT/SQL/schema/GC/views/F_Belege_SKR_direkt.sql

@@ -1,95 +0,0 @@
-SET QUOTED_IDENTIFIER ON 
-GO
-SET ANSI_NULLS ON 
-GO
-create view [dbo].[F_Belege_SKR_direkt] as
-
-select "GC_Department"."Hauptbetrieb_ID" AS "Rechtseinheit_ID",
-    "GC_Department"."Hauptbetrieb_Name" AS "Rechtseinheit_Name",
-    "GC_Department"."Standort_ID" AS "Betrieb_ID",
-    "GC_Department"."Standort_Name" AS "Betrieb_Name",
-    "Kontenrahmen_GC_Struct_SKR"."Ebene1" AS "Ebene1",
-    "Kontenrahmen_GC_Struct_SKR"."Ebene2" AS "Ebene2",
-    "Kontenrahmen_GC_Struct_SKR"."Ebene3" AS "Ebene3",
-    "Kontenrahmen_GC_Struct_SKR"."Ebene4" AS "Ebene4",
-    "Kontenrahmen_GC_Struct_SKR"."Ebene5" AS "Ebene5",
-    "Kontenrahmen_GC_Struct_SKR"."Ebene6" AS "Ebene6",
-    left("Kontenrahmen_GC_Struct_SKR"."Konto Nr", 4) + ' - ' + "Kontenrahmen_GC_Struct_SKR"."Konto Bezeichnung" AS "Konto",
-    "LOC_Belege"."Acct Nr" AS "Acct_Nr",
-    "LOC_Belege"."Text" AS "Text",
-    case
-        when left(left("LOC_Belege"."KST", 2), 1) = '1' then 'Neuwagen'
-        when left(left("LOC_Belege"."KST", 2), 1) = '2' then 'Gebrauchtwagen'
-        when left(left("LOC_Belege"."KST", 2), 1) = '3' then 'Teile & Zubehör'
-        when left(left("LOC_Belege"."KST", 2), 1) = '4' then 'Service'
-        when left(left("LOC_Belege"."KST", 2), 1) = '5' then 'Weitere Bereiche'
-        when left(left("LOC_Belege"."KST", 2), 1) = '0' then 'ohne Herkunft'
-        else 'Verwaltung'
-    end AS "Kostenstelle",
-    "LOC_Belege"."KST" AS "KST_mit_Bez",
-    left("LOC_Belege"."KST", 2) AS "KST",
-    left("LOC_Belege"."Marke", 1) AS "Markencode",
-    "LOC_Belege"."Vehicle Reference" AS "Fahrgestellnummer",
-    left("Kontenrahmen_GC_Struct_SKR"."Konto Nr", 4) + ' - ' + "Kontenrahmen_GC_Struct_SKR"."Konto Bezeichnung" AS "Konto_Buchung",
-    "LOC_Belege"."Marke" AS "Marke_mit_Bez",
-    left("LOC_Belege"."Marke", 1) AS "Marke",
-    case
-        when left(left("LOC_Belege"."Absatzkanal", 2), 1) = '1' then 'Privater Endkunde'
-        when left(left("LOC_Belege"."Absatzkanal", 2), 1) = '2' then 'Gewerbekunde'
-        when left(left("LOC_Belege"."Absatzkanal", 2), 1) = '3' then 'Großkunde'
-        when left(left("LOC_Belege"."Absatzkanal", 2), 1) = '4' then 'Sonderabnehmer'
-        when left(left("LOC_Belege"."Absatzkanal", 2), 1) = '5' then 'Wiederverkäufer'
-        when left(left("LOC_Belege"."Absatzkanal", 2), 1) = '6' then 'Wirtschaftsraum'
-        when left(left("LOC_Belege"."Absatzkanal", 2), 1) = '9' then 'Sonstige'
-        when left(left("LOC_Belege"."Absatzkanal", 2), 1) = '0' then 'ohne Absatzkanal'
-        else NULL
-    end AS "Ebene21",
-    "LOC_Belege"."Absatzkanal" AS "Absatzkanal_mit_Bez",
-    left("LOC_Belege"."Absatzkanal", 2) AS "Absatzkanal",
-    "LOC_Belege"."Free Form Document Text" AS "Ebene31",
-    "LOC_Belege"."Kostenträger" AS "Kostenträger_mit_Bez",
-    "LOC_Belege"."Skr51 Cost Unit" AS "Kostenträger_FIBU",
-    "Kontenrahmen_GC_Struct_SKR"."Ebene71" AS "Ebene71",
-    "Kontenrahmen_GC_Struct_SKR"."Ebene72" AS "Ebene72",
-    "Kontenrahmen_GC_Struct_SKR"."Ebene73" AS "Ebene73",
-    "Kontenrahmen_GC_Struct_SKR"."Ebene74" AS "Ebene74",
-    "Kontenrahmen_GC_Struct_SKR"."Ebene75" AS "Ebene75",
-    "Kontenrahmen_GC_Struct_SKR"."Ebene76" AS "Ebene76",
-    "Kontenrahmen_GC_Struct_SKR"."Ebene77" AS "Ebene77",
-    "Kontenrahmen_GC_Struct_SKR"."Ebene81" AS "Ebene81",
-    "Kontenrahmen_GC_Struct_SKR"."Ebene82" AS "Ebene82",
-    "Kontenrahmen_GC_Struct_SKR"."Ebene83" AS "Ebene83",
-    "Kontenrahmen_GC_Struct_SKR"."Ebene84" AS "Ebene84",
-    "Kontenrahmen_GC_Struct_SKR"."Ebene85" AS "Ebene85",
-    "Kontenrahmen_GC_Struct_SKR"."Ebene86" AS "Ebene86",
-    "LOC_Belege"."GuV_Bilanz" AS "GuV_Bilanz",
-    "LOC_Belege"."Susa" AS "Susa",
-    "LOC_Belege"."Mandant" AS "Mandant",
-    "LOC_Belege"."Betrag" AS "Ist",
-    "LOC_Belege"."Menge" AS "Menge",
-    "GC_Department"."Gruppe_ID" AS "Gruppe_ID",
-    "GC_Department"."Gruppe_Name" AS "Gruppe_Name",
-    "LOC_Belege"."Bookkeep Date" AS "Invoice_Date",
-    case
-        when "GC_Marken"."Fabrikat" is null then 'Fremd'
-        else "GC_Marken"."Fabrikat"
-    end AS "Fabrikat",
-    case
-        when case
-            when "GC_Marken"."Fabrikat" is null then 'Fremd'
-            else "GC_Marken"."Fabrikat"
-        end = 'Fremd' then 9
-        else "GC_Marken"."Order_By"
-    end AS "Fabrikat_Order_By"
-from "LOCOSOFT"."locosoft"."LOC_Belege" "LOC_Belege"
-    LEFT OUTER JOIN "GC"."data"."GC_Department" "GC_Department" on "LOC_Belege"."Rechtseinheit" = "GC_Department"."Hauptbetrieb"
-    and "LOC_Belege"."Betrieb" = "GC_Department"."Standort"
-    LEFT OUTER JOIN "GC"."data"."GC_Marken" "GC_Marken" on "LOC_Belege"."Marke" = "GC_Marken"."Marke_FIBU"
-    LEFT OUTER JOIN "GC"."locosoft"."Kontenrahmen_GC_Struct_SKR" "Kontenrahmen_GC_Struct_SKR" on "LOC_Belege"."Acct Nr" = "Kontenrahmen_GC_Struct_SKR"."Konto Nr"
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-SET ANSI_NULLS OFF 
-GO
-
-GO

+ 6 - 0
System/LOCOSOFT/SQL/schema/LOCOSOFT/schemas.sql

@@ -1,3 +1,4 @@
+
 if not exists(select s.schema_id from sys.schemas s where s.name = 'data') 
 	and exists(select p.principal_id from sys.database_principals p where p.name = 'dbo') begin
 	exec sp_executesql N'create schema [data] authorization [dbo]'
@@ -22,5 +23,10 @@ if not exists(select s.schema_id from sys.schemas s where s.name = 'staging')
 	and exists(select p.principal_id from sys.database_principals p where p.name = 'dbo') begin
 	exec sp_executesql N'create schema [staging] authorization [dbo]'
 end
+
+if not exists(select s.schema_id from sys.schemas s where s.name = 'template') 
+	and exists(select p.principal_id from sys.database_principals p where p.name = 'dbo') begin
+	exec sp_executesql N'create schema [template] authorization [dbo]'
+end
 GO
 

+ 1 - 1
System/LOCOSOFT/SQL/schema/LOCOSOFT/tables/transit_customers.sql

@@ -11,7 +11,7 @@ CREATE TABLE [dbo].[transit_customers] (
    [home_street] [varchar](100) NULL,
    [phone_number] [varchar](100) NULL,
    [client_db] [varchar](20) NOT NULL
-   
+
    ,CONSTRAINT [transit_customers$0] PRIMARY KEY CLUSTERED ([order_number], [order_position], [order_position_line], [client_db])
 )
 

+ 1 - 1
System/LOCOSOFT/SQL/schema/LOCOSOFT/tables/transit_vehicles.sql

@@ -11,7 +11,7 @@ CREATE TABLE [dbo].[transit_vehicles] (
    [vin] [varchar](100) NULL,
    [first_registration_date] [datetime] NULL,
    [client_db] [varchar](20) NOT NULL
-   
+
    ,CONSTRAINT [transit_vehicles$0] PRIMARY KEY CLUSTERED ([order_number], [order_position], [order_position_line], [client_db])
 )
 

+ 1 - 1
System/LOCOSOFT/SQL/schema/LOCOSOFT/users/gaps.sql

@@ -1,5 +1,5 @@
 IF SUSER_ID('gaps') IS NULL
-				BEGIN CREATE LOGIN gaps WITH PASSWORD = 0x0200B8A773F47B9FF85F6052343339696158705C4600A6DC6E61435C42D3B8FA4BA6566526871FB53A14DF5BC697CC57D2DC95467A300FEF1C8569CFF1CF863FB7243C098359 HASHED END
+				BEGIN CREATE LOGIN gaps WITH PASSWORD = 0x0200B564EAAC5C8AEE9E8F510C2972ADBB14D10AC058294AD865419CC821FDBA939E01679F516CD7B4D5D15C52E56DD2DBFD604C93FB8F81AD86F4087D378F26FB4236CAA468 HASHED END
 CREATE USER [gaps] FOR LOGIN [gaps] WITH DEFAULT_SCHEMA = [dbo]
 /*ALTER ROLE db_ddladmin ADD MEMBER gaps*/ exec sp_addrolemember 'db_ddladmin', 'gaps'
 /*ALTER ROLE db_datareader ADD MEMBER gaps*/ exec sp_addrolemember 'db_datareader', 'gaps'

+ 0 - 1
System/LOCOSOFT/SQL/schema/LOCOSOFT/views/staging.kontenrahmen_gc_struct_skr_90.sql

@@ -115,7 +115,6 @@ SELECT T1."KONTO_NR" AS "Konto Nr",
 FROM OPENROWSET(BULK 'C:\GlobalCube\GCStruct_SKR51\Kontenrahmen\Kontenrahmen.csv', FORMATFILE = 'C:\GlobalCube\GCStruct_SKR51\Kontenrahmen\Kontenrahmen.csv.xml', FIRSTROW = 2) T1
 WHERE (((left(T1."KONTO_NR", 1))) <> '9')
 GO
-
 SET QUOTED_IDENTIFIER OFF 
 GO
 SET ANSI_NULLS OFF 

+ 24 - 0
System/LOCOSOFT/SQL/schema/LOCOSOFT/views/template.GC_Department.sql

@@ -0,0 +1,24 @@
+SET QUOTED_IDENTIFIER ON 
+GO
+SET ANSI_NULLS ON 
+GO
+CREATE VIEW template.GC_Department AS
+SELECT DISTINCT T1."subsidiary_to_company_ref" "Hauptbetrieb"
+	,T1."skr51_branch" "Standort"
+	,T1."subsidiary_to_company_ref" "Hauptbetrieb_ID"
+	,'' AS Hauptbetrieb_Name
+	,right('0' + convert(VARCHAR(10), T1."skr51_branch"), 2) "Standort_ID"
+	,left(T1."skr51_brach_name", 50) "Standort_Name"
+	,NULL as Marke_ID
+	,NULL as Marke_Name
+	,NULL as Gruppe_ID
+	,NULL as Gruppe_Name
+	,NULL as Site
+FROM "LOCOSOFT"."dbo"."accounts_characteristics" T1
+GO
+SET QUOTED_IDENTIFIER OFF 
+GO
+SET ANSI_NULLS OFF 
+GO
+
+GO

+ 20 - 0
System/LOCOSOFT/SQL/schema/LOCOSOFT/views/template.GC_Marken.sql

@@ -0,0 +1,20 @@
+SET QUOTED_IDENTIFIER ON 
+GO
+SET ANSI_NULLS ON 
+GO
+CREATE VIEW template.GC_Marken AS
+
+SELECT DISTINCT T1.subsidiary_to_company_ref AS "Client_DB"
+	,T1."skr51_make" "Make"
+	,T1."skr51_make_description" "Description"
+	,T1."skr51_make_description" "Fabrikat"
+	,iif(T1."skr51_make" = '0', '99', T1."skr51_make") "Order_By"
+	,T1."skr51_make" "Marke_FIBU"
+FROM "LOCOSOFT"."dbo"."accounts_characteristics" T1
+GO
+SET QUOTED_IDENTIFIER OFF 
+GO
+SET ANSI_NULLS OFF 
+GO
+
+GO

+ 39 - 0
System/LOCOSOFT/SQL/schema/LOCOSOFT/views/template.GC_Mitarbeiter.sql

@@ -0,0 +1,39 @@
+SET QUOTED_IDENTIFIER ON 
+GO
+SET ANSI_NULLS ON 
+GO
+CREATE VIEW [template].[GC_Mitarbeiter] AS
+SELECT 
+    '1' AS "Client_DB",
+    T1."employee_number" AS "Employee_ID",
+	T1."name" as "Name",
+	'' AS "Department",
+		'' AS "Zuordnung_Funktion",
+		CASE 
+		WHEN (T1."mechanic_number" IS NOT NULL)
+			THEN ('produktiv')
+		ELSE NULL
+		END AS "Zuordnung_Produktiv",
+		CASE 
+		WHEN (T1."mechanic_number" IS NOT NULL)
+			THEN ('Monteure')
+		ELSE NULL
+		END AS "Monteur_Ebene_1",
+		null as "Monteur_Ebene_2",
+		null as "Monteur_Ebene_3",
+		null as "Zuordnung_Department_Name",
+		T1."productivity_factor" AS "productivity_factor",
+	T1."leave_date" AS "leave_date"
+
+FROM "dbo"."employees" T1
+WHERE (
+		(T1."leave_date" >= convert(DATE, '2016-01-01'))
+		OR (T1."leave_date" IS NULL)
+		)
+GO
+SET QUOTED_IDENTIFIER OFF 
+GO
+SET ANSI_NULLS OFF 
+GO
+
+GO

+ 2 - 17
System/LOCOSOFT/SQL/schema/LOCOSOFT/views_imr/staging.current_date_prognose_operativ_vj-2_imr.sql

@@ -50,23 +50,8 @@ FROM (
 			END AS "Gesamt Arbeitstage"
 	FROM "Arbeitstage" T1
 	WHERE (
-			(
-				(
-					(T1."bundeslaender_id" = '10')
-					AND ((year(T1."datum")) = ((year(((getdate()) - INTERVAL '000 00:00:00.000'))) - 2))
-					)
-				AND (T1."datum" <= ((getdate()) - INTERVAL '000 00:00:00.000'))
-				)
-			OR (
-				(
-					(
-						(T1."bundeslaender_id" = '10')
-						AND ((year(T1."datum")) = ((year(((getdate()) - INTERVAL '000 00:00:00.000'))) - 2))
-						)
-					AND (T1."datum" <= ((getdate()) - INTERVAL '000 00:00:00.000'))
-					)
-				AND (T1."datum" IN (convert(DATETIME, '2012-01-01 00:00:00.000'), convert(DATETIME, '2013-01-01 00:00:00.000'), convert(DATETIME, '2014-01-01 00:00:00.000'), convert(DATETIME, '2015-01-01 00:00:00.000'), convert(DATETIME, '2016-01-01 00:00:00.000'), convert(DATETIME, '2017-01-01 00:00:00.000')))
-				)
+			(T1."bundeslaender_id" = '7')
+			AND ((year(T1."datum")) = ((year(((getdate()) - INTERVAL '000 00:00:00.000'))) - 2))
 			)
 		-- order by "Bundeslaender Id" asc,"Datum" asc,"Wochentage Id" asc,"Arbeitstag Mofr" asc,"Zaehler Mofr" asc,"Summe Mofr" asc,"Arbeitstag Mosa" asc,"Zaehler Mosa" asc,"Summe Mosa" asc,"Feiertage Id" asc,"Gesamt Arbeitstage" asc
 	) D1

+ 87 - 0
System/LOCOSOFT/SQL/schema/LOCOSOFT/views_imr/staging.current_date_prognose_vj_imr.sql

@@ -0,0 +1,87 @@
+SET QUOTED_IDENTIFIER ON
+GO
+
+SET ANSI_NULLS ON
+GO
+
+CREATE VIEW staging.current_date_prognose_vj_imr
+AS
+SELECT "Bundeslaender Id" AS "Bundeslaender Id",
+	"Datum" AS "Datum",
+	"Wochentage Id" AS "Wochentage Id",
+	"Arbeitstag Mofr" AS "Arbeitstag Mofr",
+	"Zaehler Mofr" AS "Zaehler Mofr",
+	"Summe Mofr" AS "Summe Mofr",
+	"Arbeitstag Mosa" AS "Arbeitstag Mosa",
+	"Zaehler Mosa" AS "Zaehler Mosa",
+	"Summe Mosa" AS "Summe Mosa",
+	"Feiertage Id" AS "Feiertage Id",
+	"Jahr" AS "Jahr",
+	CASE 
+		WHEN ("Arbeitstag Mofr" = 1)
+			THEN (RCOUNT("Arbeitstag Mofr"))
+		ELSE NULL
+		END AS "Arbeitstag Nr Jahr",
+	"Gesamt Arbeitstage" AS "Gesamt Arbeitstage"
+FROM (
+	SELECT T1."bundeslaender_id" AS "Bundeslaender Id",
+		T1."datum" AS "Datum",
+		T1."wochentage_id" AS "Wochentage Id",
+		T1."arbeitstag_mofr" AS "Arbeitstag Mofr",
+		T1."zaehler_mofr" AS "Zaehler Mofr",
+		T1."summe_mofr" AS "Summe Mofr",
+		T1."arbeitstag_mosa" AS "Arbeitstag Mosa",
+		T1."zaehler_mosa" AS "Zaehler Mosa",
+		T1."summe_mosa" AS "Summe Mosa",
+		T1."feiertage_id" AS "Feiertage Id",
+		(getdate()) - 1 AS "Jahr",
+		CASE 
+			WHEN (T1."datum" BETWEEN convert(DATETIME, '2008-01-01 00:00:00.000') AND convert(DATETIME, '2008-12-31 00:00:00.000'))
+				THEN (252)
+			WHEN (T1."datum" BETWEEN convert(DATETIME, '2009-01-01 00:00:00.000') AND convert(DATETIME, '2009-12-31 00:00:00.000'))
+				THEN (252)
+			WHEN (T1."datum" BETWEEN convert(DATETIME, '2010-01-01 00:00:00.000') AND convert(DATETIME, '2010-12-31 00:00:00.000'))
+				THEN (253)
+			WHEN (T1."datum" BETWEEN convert(DATETIME, '2011-01-01 00:00:00.000') AND convert(DATETIME, '2011-12-31 00:00:00.000'))
+				THEN (250)
+			WHEN (T1."datum" BETWEEN convert(DATETIME, '2012-01-01 00:00:00.000') AND convert(DATETIME, '2012-12-31 00:00:00.000'))
+				THEN (249)
+			ELSE (250)
+			END AS "Gesamt Arbeitstage"
+	FROM "Arbeitstage" T1
+	WHERE (
+			(
+				(
+					(
+						(T1."bundeslaender_id" = '10')
+						AND (T1."arbeitstag_mofr" = 1)
+						)
+					AND ((year(T1."datum")) = 2015)
+					)
+				AND (T1."datum" <= ((getdate()) - 1))
+				)
+			OR (
+				(
+					(
+						(T1."bundeslaender_id" = '10')
+						AND ((year(T1."datum")) = (year(((getdate()) - 1))))
+						)
+					AND (T1."datum" <= ((getdate()) - 1))
+					)
+				AND (T1."datum" IN (convert(DATETIME, '2015-01-01 00:00:00.000'), convert(DATETIME, '2016-01-01 00:00:00.000'), convert(DATETIME, '2017-01-01 00:00:00.000'), convert(DATETIME, '2018-01-01 00:00:00.000'), convert(DATETIME, '2019-01-01 00:00:00.000')))
+				)
+			)
+		-- order by "Bundeslaender Id" asc,"Datum" asc,"Wochentage Id" asc,"Arbeitstag Mofr" asc,"Zaehler Mofr" asc,"Summe Mofr" asc,"Arbeitstag Mosa" asc,"Zaehler Mosa" asc,"Summe Mosa" asc,"Feiertage Id" asc,"Gesamt Arbeitstage" asc
+	) D1
+GO
+
+SET QUOTED_IDENTIFIER OFF
+GO
+
+SET ANSI_NULLS OFF
+GO
+
+
+GO
+
+

+ 4 - 4
Tasks/scripts/Tools/controllers/ImpromptuController.php

@@ -23,7 +23,7 @@ class ImpromptuController
 		if (is_dir($imr)) {
 			$imrPath = $imr;
 			$newCat = strtolower($export);
-			$impCtrl->OpenCatalog($newCat, str_rot13($user), str_rot13($pw));
+			$impCtrl->OpenCatalog($newCat, str_rot13($user), str_rot13($pw), $imrPath);
 			$impCtrl->RenameCatalog($imrPath, strtolower($cat));
 			$impCtrl->Quit();
 			return;
@@ -58,10 +58,10 @@ class ImpromptuController
 		$this->app = new COM("CognosImpromptu.Application");
 	}
 
-	public function OpenCatalog ($catFile, $user, $pw) 
+	public function OpenCatalog ($catFile, $user, $pw, $imrPath) 
 	{
 		if (strpos($catFile, "\\") <= 0) {
-			$catFile = realpath(dirname(__FILE__)."/../../../../System/LOCOSOFT/Catalogs/"). "\\" . $catFile;
+			$catFile = realpath($imrPath."/../../Catalogs/"). "\\" . $catFile;
 		}
 		$this->app->OpenCatalog($catFile, "Ersteller", "", $user, $pw);
 		$this->catFile = $catFile;
@@ -104,7 +104,7 @@ class ImpromptuController
 		if ($catFile == "") {
 			$catFile = $this->openFileAndExtractCatInfo($imrFile);
 		}
-		$this->OpenCatalog($catFile, $user, $pw);
+		$this->OpenCatalog($catFile, $user, $pw, dirname($imrFile));
 		$this->report = $this->app->OpenReport($imrFile);			
 	}
 	

+ 2 - 1
Tasks/scripts/db_run.py

@@ -1,6 +1,7 @@
 from concurrent.futures import ThreadPoolExecutor
 from pathlib import Path
 import subprocess
+import sys
 
 
 def task(name):
@@ -16,4 +17,4 @@ def main(base_dir):
 
 
 if __name__ == '__main__':
-    main('C:\\GlobalCube\\System\\LOCOSOFT\\SQL\\batch')
+    main(f"C:\\GlobalCube\\System\\{sys.argv[1]}\\SQL\\batch")

+ 1 - 1
Tasks/scripts/transformer11.bat

@@ -7,7 +7,7 @@ echo == Modell "%~n1" ==
 copy /Y %PORTAL%\System\LOCOSOFT\Models\%~n1.pyj  %PORTAL%\System\LOCOSOFT\Models\gefuellt\%~n1.pyj
 
 
-%COGNOS11%\cogtr.exe -n -c -g -p%PORTAL:~0,-1%\System\LOCOSOFT\Models\gefuellt\%~n1.pyj" 
+%COGNOS11%\cogtr.exe -n -c -g -lGlobal1=Global1/Cognos#11 -p%PORTAL:~0,-1%\System\LOCOSOFT\Models\gefuellt\%~n1.pyj" 
 
 copy /Y %PORTAL%\System\LOCOSOFT\Logs\%~n1.log %TASKS%\logs
 

Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff