[Stacomir-commits] r302 - pkg/stacomir/R

[noreply at r-forge.r-project.org]

Author: briand
Date: 2017-03-13 17:52:21 +0100 (Mon, 13 Mar 2017)
New Revision: 302

Modified:
   pkg/stacomir/R/BilanFonctionnementDC.r
   pkg/stacomir/R/BilanFonctionnementDF.r
   pkg/stacomir/R/BilanMigrationMult.r
   pkg/stacomir/R/funtraitement_poids.r
Log:
the previous change did not work with overlaps

Modified: pkg/stacomir/R/BilanFonctionnementDC.r
===================================================================
--- pkg/stacomir/R/BilanFonctionnementDC.r	2017-03-13 16:01:36 UTC (rev 301)
+++ pkg/stacomir/R/BilanFonctionnementDC.r	2017-03-13 16:52:21 UTC (rev 302)
@@ -52,7 +52,7 @@
 					" FROM  ",get("sch",envir=envir_stacomi),"t_periodefonctdispositif_per per",
 					" INNER JOIN ref.tr_typearretdisp_tar tar ON tar.tar_code=per.per_tar_code",sep="")
 			req at colonnedebut<-"per_date_debut"
-			req at colonnefin<-"per_date_debut"
+			req at colonnefin<-"per_date_fin"
 			req at datedebut<-object at horodatedebut@horodate
 			req at datefin<-object at horodatefin@horodate
 			req at order_by<-"ORDER BY per_date_debut"

Modified: pkg/stacomir/R/BilanFonctionnementDF.r
===================================================================
--- pkg/stacomir/R/BilanFonctionnementDF.r	2017-03-13 16:01:36 UTC (rev 301)
+++ pkg/stacomir/R/BilanFonctionnementDF.r	2017-03-13 16:52:21 UTC (rev 302)
@@ -56,7 +56,7 @@
 					" FROM  ",get("sch",envir=envir_stacomi),"t_periodefonctdispositif_per per",
 					" INNER JOIN ref.tr_typearretdisp_tar tar ON tar.tar_code=per.per_tar_code",sep="")
 			req at colonnedebut="per_date_debut"
-			req at colonnefin="per_date_debut"
+			req at colonnefin="per_date_fin"
 			req at order_by="ORDER BY per_date_debut"
 			req at datedebut<-object at horodatedebut@horodate
 			req at datefin<-object at horodatefin@horodate

Modified: pkg/stacomir/R/BilanMigrationMult.r
===================================================================
--- pkg/stacomir/R/BilanMigrationMult.r	2017-03-13 16:01:36 UTC (rev 301)
+++ pkg/stacomir/R/BilanMigrationMult.r	2017-03-13 16:52:21 UTC (rev 302)
@@ -273,9 +273,9 @@
 			req=new("RequeteODBCwheredate")
 			req at baseODBC<-get("baseODBC", envir=envir_stacomi)			
 			req at colonnedebut<-"ope_date_debut"
-			req at colonnefin<-"ope_date_debut"
-			req at datedebut=as.POSIXlt(bilanMigrationMult at pasDeTemps@dateDebut)
-			req at datefin=as.POSIXlt(DateFin(bilanMigrationMult at pasDeTemps))
+			req at colonnefin<-"ope_date_fin"
+			req at datedebut=as.Date(bilanMigrationMult at pasDeTemps@dateDebut)
+			req at datefin=as.Date(DateFin(bilanMigrationMult at pasDeTemps))
 			dc = vector_to_listsql(bilanMigrationMult at dc@dc_selectionne)
 			tax=vector_to_listsql(bilanMigrationMult at taxons@data$tax_code)
 			std=vector_to_listsql(bilanMigrationMult at stades@data$std_code)

Modified: pkg/stacomir/R/funtraitement_poids.r
===================================================================
--- pkg/stacomir/R/funtraitement_poids.r	2017-03-13 16:01:36 UTC (rev 301)
+++ pkg/stacomir/R/funtraitement_poids.r	2017-03-13 16:52:21 UTC (rev 302)
@@ -48,7 +48,7 @@
 	req at datedebut<-as.POSIXlt(time.sequence[min(index)])
 	req at datefin<-as.POSIXlt(time.sequence[max(index)])
 	req at colonnedebut<-"coe_date_debut"
-	req at colonnefin<-"coe_date_debut"
+	req at colonnefin<-"coe_date_fin"
 	req at and<-c("and coe_tax_code='2038'","and coe_std_code='CIV'")
 	req at order_by<-"order by coe_date_debut"
 	req<-stacomirtools::connect(req)