Index: APPS/Halux/Planning/impl/Queries.cls.xml
===================================================================
diff -u -r954 -r994
--- APPS/Halux/Planning/impl/Queries.cls.xml	(.../Queries.cls.xml)	(revision 954)
+++ APPS/Halux/Planning/impl/Queries.cls.xml	(.../Queries.cls.xml)	(revision 994)
@@ -1,43 +1,92 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-03-25 09:44:28">
+<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-03-29 13:41:10">
 <Class name="APPS.Halux.Planning.impl.Queries">
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%RegisteredObject</Super>
-<TimeChanged>62175,35155.092653</TimeChanged>
+<TimeChanged>62179,49271.111348</TimeChanged>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Query name="qGeefPlanningOverzicht">
 <Type>%SQLQuery</Type>
 <FormalSpec>Van:%Date,Tot:%Date</FormalSpec>
-<SqlQuery><![CDATA[	SELECT PI.Categorie, TI.Dag, COALESCE(Sum(ALUFrees->Hoeveelheid)*PI.Aantal,0) As ALUFrees, COALESCE(Sum(ALUOperator->Hoeveelheid)*PI.Aantal,0) As ALUOperator, COALESCE(Sum(ALUZaag->Hoeveelheid)*PI.Aantal,0) As ALUZaag, COALESCE(Sum(Bewerkingscenter->Hoeveelheid)*PI.Aantal,0) As Bewerkingscenter, COALESCE(Sum(HoekkastInpak->Hoeveelheid)*PI.Aantal,0) As HoekkastInpak, COALESCE(Sum(HoekkastMontage->Hoeveelheid)*PI.Aantal,0) As HoekkastMontage, COALESCE(Sum(HoekkastZaag->Hoeveelheid)*PI.Aantal,0) As HoekkastZaag, COALESCE(Sum(Houtzaag->Hoeveelheid)*PI.Aantal,0) As Houtzaag, COALESCE(Sum(KartonMachine->Hoeveelheid)*PI.Aantal,0) As KartonMachine, COALESCE(Sum(TBXPers1->Hoeveelheid)*PI.Aantal,0) As TBXPers1, COALESCE(Sum(TBXPers2->Hoeveelheid)*PI.Aantal,0) As TBXPers2, COALESCE(Sum(TBXPers3->Hoeveelheid)*PI.Aantal,0) As TBXPers3, COALESCE(Sum(TBXPicking->Hoeveelheid)*PI.Aantal,0) As TBXPicking, COALESCE(Sum(Voormontage->Hoeveelheid)*PI.Aantal,0) As Voormontage
+<SqlQuery><![CDATA[	SELECT CAST(TI.Gepland As DATE) As Gepland, PI.Categorie,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_ALUFrees_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As ALUFrees_VM,
+	 COALESCE(Sum(ResourceGebruik_ALUFrees_Hoeveelheid)*PI.Aantal,0) As ALUFrees,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_ALUOperator_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As ALUOperator_VM,
+	 COALESCE(Sum(ResourceGebruik_ALUOperator_Hoeveelheid)*PI.Aantal,0) As ALUOperator,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_ALUZaag_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As ALUZaag_VM,
+	 COALESCE(Sum(ResourceGebruik_ALUZaag_Hoeveelheid)*PI.Aantal,0) As ALUZaag,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_Bewerkingscenter_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As Bewerkingscenter_VM,
+	 COALESCE(Sum(ResourceGebruik_Bewerkingscenter_Hoeveelheid)*PI.Aantal,0) As Bewerkingscenter,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_HoekkastInpak_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As HoekkastInpak_VM,
+	 COALESCE(Sum(ResourceGebruik_HoekkastInpak_Hoeveelheid)*PI.Aantal,0) As HoekkastInpak,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_HoekkastMontage_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As HoekkastMontage_VM,
+	 COALESCE(Sum(ResourceGebruik_HoekkastMontage_Hoeveelheid)*PI.Aantal,0) As HoekkastMontage,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_HoekkastZaag_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As HoekkastZaag_VM,
+	 COALESCE(Sum(ResourceGebruik_HoekkastZaag_Hoeveelheid)*PI.Aantal,0) As HoekkastZaag,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_Houtzaag_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As Houtzaag_VM,
+	 COALESCE(Sum(ResourceGebruik_Houtzaag_Hoeveelheid)*PI.Aantal,0) As Houtzaag,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_KartonMachine_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As KartonMachine_VM,
+	 COALESCE(Sum(ResourceGebruik_KartonMachine_Hoeveelheid)*PI.Aantal,0) As KartonMachine,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_TBXPers1_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As TBXPers1_VM,
+	 COALESCE(Sum(ResourceGebruik_TBXPers1_Hoeveelheid)*PI.Aantal,0) As TBXPers1,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_TBXPers2_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As TBXPers2_VM,
+	 COALESCE(Sum(ResourceGebruik_TBXPers2_Hoeveelheid)*PI.Aantal,0) As TBXPers2,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_TBXPers3_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As TBXPers3_VM,
+	 COALESCE(Sum(ResourceGebruik_TBXPers3_Hoeveelheid)*PI.Aantal,0) As TBXPers3,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_TBXPicking_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As TBXPicking_VM,
+	 COALESCE(Sum(ResourceGebruik_TBXPicking_Hoeveelheid)*PI.Aantal,0) As TBXPicking,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_Voormontage_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As Voormontage_VM,
+	 COALESCE(Sum(ResourceGebruik_Voormontage_Hoeveelheid)*PI.Aantal,0) As Voormontage
 	 FROM APPS_Halux_Planning_impl.ToeleveringInfo TI
-	 JOIN APPS_Halux_Planning_impl.ToeleveringInfo_ProductInfoLijst PIL ON TI.ID = PIL.ToeleveringInfo
-	 JOIN APPS_Halux_Planning_impl.ProductInfo PI ON PI.ID = PIL.ProductInfoLijst
-	 JOIN APPS_Halux_Planning_impl.ProductInfo_ActiviteitInfoLijst AIL ON PI.ID = AIL.ProductInfo
-	 JOIN APPS_Halux_Planning_impl.ActiviteitInfo AI ON AI.ID = AIL.ActiviteitInfoLijst
-	 JOIN APPS_Halux_Planning_impl.ResourceGebruik RG ON AI.ResourceGebruik = RG.ID
-	 WHERE :Van < TI.Dag AND TI.Dag < :Tot
-	 GROUP BY TI.Dag]]></SqlQuery>
+ 	 JOIN APPS_Halux_Planning_impl.ProductInfo PI ON TI.ID = PI.ToeleveringInfoID
+	 JOIN APPS_Halux_Planning_impl.ActiviteitInfo AI ON PI.ID = AI.ProductInfoID
+	 WHERE :Van < CAST(TI.Gepland As DATE) AND CAST(TI.Gepland As DATE) < :Tot
+	 GROUP BY CAST(TI.Gepland As DATE), PI.Categorie]]></SqlQuery>
 </Query>
 
 <Query name="qGeefPlanningDetail">
 <Type>%SQLQuery</Type>
 <FormalSpec>Datum:%Date,Categorie:APPS.Halux.Planning.enu.Categorie</FormalSpec>
-<SqlQuery><![CDATA[	SELECT AI.Naam As Activiteit, AI.Fase As ActiviteitFase, PI.Categorie, TI.Dag, TI.DueOut, TI.GeplandStatus, TI.IngegevenDoor, TI.IsASAP, TI.Klant, TI.ProductieStatus, TI.ToeleveringNummer, PI.Aantal, PI.ProductCode, PI.StockProbleem, COALESCE(Sum(ALUFrees->Hoeveelheid)*PI.Aantal,0) As ALUFrees, COALESCE(Sum(ALUOperator->Hoeveelheid)*PI.Aantal,0) As ALUOperator, COALESCE(Sum(ALUZaag->Hoeveelheid)*PI.Aantal,0) As ALUZaag, COALESCE(Sum(Bewerkingscenter->Hoeveelheid)*PI.Aantal,0) As Bewerkingscenter, COALESCE(Sum(HoekkastInpak->Hoeveelheid)*PI.Aantal,0) As HoekkastInpak, COALESCE(Sum(HoekkastMontage->Hoeveelheid)*PI.Aantal,0) As HoekkastMontage, COALESCE(Sum(HoekkastZaag->Hoeveelheid)*PI.Aantal,0) As HoekkastZaag, COALESCE(Sum(Houtzaag->Hoeveelheid)*PI.Aantal,0) As Houtzaag, COALESCE(Sum(KartonMachine->Hoeveelheid)*PI.Aantal,0) As KartonMachine, COALESCE(Sum(TBXPers1->Hoeveelheid)*PI.Aantal,0) As TBXPers1, COALESCE(Sum(TBXPers2->Hoeveelheid)*PI.Aantal,0) As TBXPers2, COALESCE(Sum(TBXPers3->Hoeveelheid)*PI.Aantal,0) As TBXPers3, COALESCE(Sum(TBXPicking->Hoeveelheid)*PI.Aantal,0) As TBXPicking, COALESCE(Sum(Voormontage->Hoeveelheid)*PI.Aantal,0) As Voormontage
-	 FROM APPS_Halux_Planning_impl.ToeleveringInfo TI
-	 JOIN APPS_Halux_Planning_impl.ToeleveringInfo_ProductInfoLijst PIL ON TI.ID = PIL.ToeleveringInfo
-	 JOIN APPS_Halux_Planning_impl.ProductInfo PI ON PI.ID = PIL.ProductInfoLijst
-	 JOIN APPS_Halux_Planning_impl.ProductInfo_ActiviteitInfoLijst AIL ON PI.ID = AIL.ProductInfo
-	 JOIN APPS_Halux_Planning_impl.ActiviteitInfo AI ON AI.ID = AIL.ActiviteitInfoLijst
-	 JOIN APPS_Halux_Planning_impl.ResourceGebruik RG ON AI.ResourceGebruik = RG.ID
-	 WHERE TI.Dag = :Datum AND ((:Categorie is null) OR (PI.Categorie = :Categorie))
-	 GROUP BY TI.Dag, AI.Naam, PI.ProductCode]]></SqlQuery>
+<SqlQuery><![CDATA[	SELECT AI.Naam As Activiteit, AI.Fase As ActiviteitFase, PI.Categorie, CAST(TI.Gepland As DATE) As Gepland, TI.DueOut, TI.GeplandStatus, TI.IngegevenDoor, TI.IsASAP, TI.Klant, TI.ProductieStatus, TI.ToeleveringNummer, PI.Aantal, PI.ProductCode, PI.StockProbleem, PI.VerpakkingType,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_ALUFrees_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As ALUFrees_VM,
+	 COALESCE(Sum(ResourceGebruik_ALUFrees_Hoeveelheid)*PI.Aantal,0) As ALUFrees,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_ALUOperator_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As ALUOperator_VM,
+	 COALESCE(Sum(ResourceGebruik_ALUOperator_Hoeveelheid)*PI.Aantal,0) As ALUOperator,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_ALUZaag_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As ALUZaag_VM,
+	 COALESCE(Sum(ResourceGebruik_ALUZaag_Hoeveelheid)*PI.Aantal,0) As ALUZaag,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_Bewerkingscenter_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As Bewerkingscenter_VM,
+	 COALESCE(Sum(ResourceGebruik_Bewerkingscenter_Hoeveelheid)*PI.Aantal,0) As Bewerkingscenter,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_HoekkastInpak_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As HoekkastInpak_VM,
+	 COALESCE(Sum(ResourceGebruik_HoekkastInpak_Hoeveelheid)*PI.Aantal,0) As HoekkastInpak,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_HoekkastMontage_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As HoekkastMontage_VM,
+	 COALESCE(Sum(ResourceGebruik_HoekkastMontage_Hoeveelheid)*PI.Aantal,0) As HoekkastMontage,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_HoekkastZaag_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As HoekkastZaag_VM,
+	 COALESCE(Sum(ResourceGebruik_HoekkastZaag_Hoeveelheid)*PI.Aantal,0) As HoekkastZaag,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_Houtzaag_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As Houtzaag_VM,
+	 COALESCE(Sum(ResourceGebruik_Houtzaag_Hoeveelheid)*PI.Aantal,0) As Houtzaag,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_KartonMachine_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As KartonMachine_VM,
+	 COALESCE(Sum(ResourceGebruik_KartonMachine_Hoeveelheid)*PI.Aantal,0) As KartonMachine,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_TBXPers1_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As TBXPers1_VM,
+	 COALESCE(Sum(ResourceGebruik_TBXPers1_Hoeveelheid)*PI.Aantal,0) As TBXPers1,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_TBXPers2_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As TBXPers2_VM,
+	 COALESCE(Sum(ResourceGebruik_TBXPers2_Hoeveelheid)*PI.Aantal,0) As TBXPers2,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_TBXPers3_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As TBXPers3_VM,
+	 COALESCE(Sum(ResourceGebruik_TBXPers3_Hoeveelheid)*PI.Aantal,0) As TBXPers3,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_TBXPicking_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As TBXPicking_VM,
+	 COALESCE(Sum(ResourceGebruik_TBXPicking_Hoeveelheid)*PI.Aantal,0) As TBXPicking,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_Voormontage_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As Voormontage_VM,
+	 COALESCE(Sum(ResourceGebruik_Voormontage_Hoeveelheid)*PI.Aantal,0) As Voormontage FROM APPS_Halux_Planning_impl.ToeleveringInfo TI
+	 JOIN APPS_Halux_Planning_impl.ProductInfo PI ON TI.ID = PI.ToeleveringInfoID
+	 JOIN APPS_Halux_Planning_impl.ActiviteitInfo AI ON PI.ID = AI.ProductInfoID
+	 WHERE CAST(TI.Gepland As DATE) = :Datum AND ((:Categorie is null) OR (PI.Categorie = :Categorie))
+	 GROUP BY CAST(TI.Gepland As DATE), AI.Naam, PI.ProductCode]]></SqlQuery>
 </Query>
 
 <Query name="qGeefUniekeToeleveringen">
 <Type>%SQLQuery</Type>
 <SqlQuery>	SELECT DISTINCT ToeleveringNummer FROM APPS_Halux_Planning_impl.ToeleveringInfo ORDER BY ToeleveringNummer ASC</SqlQuery>
 </Query>
 </Class>
-<Checksum value="940421098"/>
+<Checksum value="121678320"/>
 </Export>