GDFS#23474

svn path=/Customer/trunk/; revision=15313

GDFS/gdfs.sql

@@ -1,7 +1,7 @@
 -- Script containing customer specific configuration sql statements for GDFS: Gaz de France Suez
 -- (c) 2011 SG facilitor
--- $Revision: 2 $
--- $Modtime: 26-01-12 10:36 $
+-- $Revision: 3 $
+-- $Modtime: 8-06-12 14:24 $
 --
 -- Support: +31 53 4800700
 
@@ -118,7 +118,7 @@ AS
           ins_deel_omschrijving,
           SUBSTR (
              uitleen.fac_tracking_oms,
-             26,
+             instr(uitleen.fac_tracking_oms, 'is uitgegeven aan') + 18,
              DECODE (INSTR (uitleen.fac_tracking_oms, CHR (10)),
                      0, 50,
                      INSTR (uitleen.fac_tracking_oms, CHR (10)) - 26)),
@@ -187,42 +187,22 @@ AS
           AND TRUNC (uitleen.fac_tracking_datum) <>
                 TRUNC (inname.fac_tracking_datum);
 
-CREATE OR REPLACE VIEW gdfs_v_rap_dienstrapport
+CREATE OR REPLACE VIEW GDFS_V_RAP_DIENSTRAPPORT
 (
-   hide_f_datum,
-   fclt_f_dienstrapport,
-   door,
-   fclt_d_datum,
-   tijd,
-   actie
+   HIDE_F_DATUM,
+   FCLT_D_DATUM,
+   DIENSTRAPPORT,
+   PERSOON
 )
-AS
-   SELECT n.mld_melding_note_aanmaak,
+AS 
+   SELECT to_char(mld_melding_datum, 'yyyymmddhh24'),
+     to_char(m.mld_melding_datum, 'dd-mm-yyyy'),
           m.mld_melding_key,
           (SELECT prs_perslid_naam_full
              FROM prs_v_perslid_fullnames pf
-            WHERE pf.prs_perslid_key = n.prs_perslid_key),
-          TO_CHAR (n.mld_melding_note_aanmaak, 'dd-mm-yyyy'),
-          TO_CHAR (n.mld_melding_note_aanmaak, 'hh24:mi'),
-          n.mld_melding_note_omschrijving
-     FROM mld_melding m, mld_melding_note n
-    WHERE mld_stdmelding_key = 2 AND m.mld_melding_key = n.mld_melding_key
-   UNION ALL
-   SELECT t.fac_tracking_datum,
-          m.mld_melding_key,
-          (SELECT prs_perslid_naam_full
-             FROM prs_v_perslid_fullnames pf
-            WHERE pf.prs_perslid_key = t.prs_perslid_key),
-          TO_CHAR (t.fac_tracking_datum, 'dd-mm-yyyy'),
-          TO_CHAR (t.fac_tracking_datum, 'hh24:mi'),
-          DECODE (t.fac_srtnotificatie_key,
-                  30, 'Aanmaak dienstrapport',
-                  26, 'Afsluiten dienstrapport',
-                  'Onbekend')
-     FROM mld_melding m, fac_tracking t
-    WHERE     mld_stdmelding_key = 2
-          AND m.mld_melding_key = t.fac_tracking_refkey
-          AND t.fac_srtnotificatie_key IN (30, 26)                 -- NEW, AFM
+            WHERE pf.prs_perslid_key = m.prs_perslid_key)
+     FROM mld_melding m
+    WHERE     mld_stdmelding_key = 2;
 
 CREATE OR REPLACE VIEW gdfs_v_export_kenteken
 (