ATCH#32869: periode 13 heeft geen 4 maar 5 weken

svn path=/Database/trunk/; revision=26789
This commit is contained in:
Marcel Bourseau
2015-10-27 16:15:26 +00:00
parent a1518498fd
commit 0fa03b702f
2 changed files with 8 additions and 8 deletions

View File

@@ -157,7 +157,7 @@ PROCEDURE care_v_rap2_factuur_uren_a
INSERT INTO care_periode (jaar, periode, week, maandag)
SELECT
TO_CHAR (SYSDATE - 7*(LEVEL-1), 'IYYY') jaar,
FLOOR((TO_CHAR (SYSDATE - 7*(LEVEL-1),'IW') - 1) /4) + 1 periode,
LEAST(FLOOR((TO_CHAR (SYSDATE - 7*(LEVEL-1),'IW') - 1) /4) + 1, 13) periode,
TO_CHAR (SYSDATE - 7*(LEVEL-1), 'IW') week,
TRUNC (SYSDATE - 7*(LEVEL-1), 'IW') startdatum
FROM DUAL
@@ -213,7 +213,7 @@ PROCEDURE care_v_rap2_factuur_uren_e
INSERT INTO care_periode (jaar, periode, week, maandag)
SELECT
TO_CHAR (SYSDATE - 7*(LEVEL-1), 'IYYY') jaar,
FLOOR((TO_CHAR (SYSDATE - 7*(LEVEL-1),'IW') - 1) /4) + 1 periode,
LEAST(FLOOR((TO_CHAR (SYSDATE - 7*(LEVEL-1),'IW') - 1) /4) + 1, 13) periode,
TO_CHAR (SYSDATE - 7*(LEVEL-1), 'IW') week,
TRUNC (SYSDATE - 7*(LEVEL-1), 'IW') startdatum
FROM DUAL

View File

@@ -867,7 +867,7 @@ AS
ou.mld_opdr_uren_key,
TO_NUMBER (TO_CHAR (ou.mld_opdr_uren_datum, 'IYYY')) jaar,
TO_NUMBER (TO_CHAR (ou.mld_opdr_uren_datum, 'IW')) weeknr,
FLOOR((TO_CHAR (ou.mld_opdr_uren_datum,'IW') - 1) /4) + 1 periodenr,
LEAST(FLOOR((TO_CHAR (ou.mld_opdr_uren_datum,'IW') - 1) /4) + 1, 13) periodenr,
( TRUNC (ou.mld_opdr_uren_datum)
- DECODE (TO_CHAR (ou.mld_opdr_uren_datum, 'D'), '1', 8, TO_CHAR (ou.mld_opdr_uren_datum, 'D'))
+ 2)
@@ -942,7 +942,7 @@ AS
ou.mld_opdr_uren_key,
TO_NUMBER (TO_CHAR (ou.mld_opdr_uren_datum, 'IYYY')) jaar,
TO_NUMBER (TO_CHAR (ou.mld_opdr_uren_datum, 'IW')) weeknr,
FLOOR((TO_CHAR (ou.mld_opdr_uren_datum,'IW') - 1) /4) + 1 periodenr,
LEAST(FLOOR((TO_CHAR (ou.mld_opdr_uren_datum,'IW') - 1) /4) + 1, 13) periodenr,
( TRUNC (ou.mld_opdr_uren_datum)
- DECODE (TO_CHAR (ou.mld_opdr_uren_datum, 'D'), '1', 8, TO_CHAR (ou.mld_opdr_uren_datum, 'D'))
+ 2)
@@ -2917,7 +2917,7 @@ CREATE_VIEW(care_v_periodeweektabel_2jaar, 0)
AS
SELECT
TO_CHAR (SYSDATE - 7*(LEVEL-1), 'IYYY') jaar,
FLOOR((TO_CHAR (SYSDATE - 7*(LEVEL-1),'IW') - 1) /4) + 1 periode,
LEAST(FLOOR((TO_CHAR (SYSDATE - 7*(LEVEL-1),'IW') - 1) /4) + 1, 13) periode,
TO_CHAR (SYSDATE - 7*(LEVEL-1), 'IW') week,
TRUNC (SYSDATE - 7*(LEVEL-1), 'IW') startdatum
FROM DUAL
@@ -2937,7 +2937,7 @@ CREATE_VIEW(care_v_periodeweektabel, 0)
AS
SELECT
TO_CHAR (SYSDATE - 7*(LEVEL-1), 'IYYY') jaar,
FLOOR((TO_CHAR (SYSDATE - 7*(LEVEL-1),'IW') - 1) /4) + 1 periode,
LEAST(FLOOR((TO_CHAR (SYSDATE - 7*(LEVEL-1),'IW') - 1) /4) + 1, 13) periode,
TO_CHAR (SYSDATE - 7*(LEVEL-1), 'IW') week,
TRUNC (SYSDATE - 7*(LEVEL-1), 'IW') startdatum
FROM DUAL
@@ -5147,7 +5147,7 @@ CREATE_VIEW(care_v_qvw_periodeweektabel, 0)
AS
SELECT
TO_CHAR (SYSDATE - 7*(LEVEL-1), 'IYYY') jaar,
DECODE(FLOOR((TO_CHAR (SYSDATE - 7*(LEVEL-1),'IW') - 1) /4) + 1, 14, 13,FLOOR((TO_CHAR (SYSDATE - 7*(LEVEL-1),'IW') - 1) /4) + 1) periode,
LEAST(FLOOR((TO_CHAR (SYSDATE - 7*(LEVEL-1),'IW') - 1) /4) + 1, 13) periode,
TO_CHAR (SYSDATE - 7*(LEVEL-1), 'IW') week,
TRUNC (SYSDATE - 7*(LEVEL-1), 'IW') startdatum
FROM DUAL
@@ -5155,7 +5155,7 @@ CONNECT BY LEVEL <= 5*52+1
UNION
SELECT
TO_CHAR (SYSDATE + 7*(LEVEL), 'IYYY') jaar,
DECODE(FLOOR((TO_CHAR (SYSDATE + 7*(LEVEL),'IW') - 1) /4) + 1, 14, 13,FLOOR((TO_CHAR (SYSDATE + 7*(LEVEL),'IW') - 1) /4) + 1) periode,
LEAST(FLOOR((TO_CHAR (SYSDATE + 7*(LEVEL),'IW') - 1) /4) + 1, 13) periode,
TO_CHAR (SYSDATE + 7*(LEVEL), 'IW') week,
TRUNC (SYSDATE + 7*(LEVEL), 'IW') startdatum
FROM DUAL