From 9c3de75a75564fb68efd34fffcfb39ca00fbfc2e Mon Sep 17 00:00:00 2001
From: kledezma <kledezma@atesa.tfs.local>
Date: Wed, 20 Jan 2021 15:42:42 +0000
Subject: [PATCH] DDL Cascada de Meses, en los dos reportes. KLB

git-tfs-id: [http://192.168.1.10:8080/tfs/AyA]$/SINORT;C516
---
 .../ReportesSIGPC/rpt_desglocegestiones.rdl   |  38 ++++++++++++--
 .../rpt_desglocegestiones.rdl.data            | Bin 10240 -> 10240 bytes
 .../ReportesSIGPC/rpt_trabajoactividad.rdl    |  48 +++++++++++++++---
 .../rpt_trabajoactividad.rdl.data             | Bin 10240 -> 8704 bytes
 4 files changed, 75 insertions(+), 11 deletions(-)

diff --git a/ReportesSIGPC/ReportesSIGPC/rpt_desglocegestiones.rdl b/ReportesSIGPC/ReportesSIGPC/rpt_desglocegestiones.rdl
index bd544cb57..26d531eb6 100644
--- a/ReportesSIGPC/ReportesSIGPC/rpt_desglocegestiones.rdl
+++ b/ReportesSIGPC/ReportesSIGPC/rpt_desglocegestiones.rdl
@@ -1600,7 +1600,7 @@
         </Field>
       </Fields>
     </DataSet>
-    <DataSet Name="Meses">
+    <DataSet Name="MesInicio">
       <Query>
         <DataSourceName>SIGPC</DataSourceName>
         <CommandText>WITH months(MonthNumber) AS
@@ -1614,6 +1614,38 @@
 select MonthNumber, FORMAT(CAST('01/'+CONVERT(varchar,MonthNumber )+'/2000' as date) , 'MMMMM') as Mes
 from months
   WHERE MonthNumber &gt; 0
+  ORDER BY MonthNumber</CommandText>
+      </Query>
+      <Fields>
+        <Field Name="MonthNumber">
+          <DataField>MonthNumber</DataField>
+          <rd:TypeName>System.Int32</rd:TypeName>
+        </Field>
+        <Field Name="Mes">
+          <DataField>Mes</DataField>
+          <rd:TypeName>System.String</rd:TypeName>
+        </Field>
+      </Fields>
+    </DataSet>
+    <DataSet Name="MesFinal">
+      <Query>
+        <DataSourceName>SIGPC</DataSourceName>
+        <QueryParameters>
+          <QueryParameter Name="@Mes">
+            <Value>=Parameters!Mes.Value</Value>
+          </QueryParameter>
+        </QueryParameters>
+        <CommandText>WITH months(MonthNumber) AS
+(
+    SELECT 0
+    UNION ALL
+    SELECT MonthNumber+1 
+    FROM months
+    WHERE MonthNumber &lt; 12
+)
+select MonthNumber, FORMAT(CAST('01/'+CONVERT(varchar,MonthNumber )+'/2000' as date) , 'MMMMM') as Mes
+from months
+  WHERE MonthNumber &gt;= @Mes
   ORDER BY MonthNumber</CommandText>
       </Query>
       <Fields>
@@ -1659,7 +1691,7 @@ from months
       <Prompt>Mes Inicio</Prompt>
       <ValidValues>
         <DataSetReference>
-          <DataSetName>Meses</DataSetName>
+          <DataSetName>MesInicio</DataSetName>
           <ValueField>MonthNumber</ValueField>
           <LabelField>Mes</LabelField>
         </DataSetReference>
@@ -1675,7 +1707,7 @@ from months
       <Prompt>Mes Final</Prompt>
       <ValidValues>
         <DataSetReference>
-          <DataSetName>Meses</DataSetName>
+          <DataSetName>MesFinal</DataSetName>
           <ValueField>MonthNumber</ValueField>
           <LabelField>Mes</LabelField>
         </DataSetReference>
diff --git a/ReportesSIGPC/ReportesSIGPC/rpt_desglocegestiones.rdl.data b/ReportesSIGPC/ReportesSIGPC/rpt_desglocegestiones.rdl.data
index 4c6744234dd0e0619dde99e01951eb8bb0ecd49e..c36efdc68cd9eb16930cc98b694a55a77dec9ccf 100644
GIT binary patch
delta 209
zcmZn&Xb9Ml!@@Sfj&YvT`^iNtZH!ws|73Z>%(nSzN~!wZ&5t>Jm|55unHVPP@!V%K
ze3A_moGi>6!B*FC7Q`&%6=q>!WMr7!&a23_hyesPZ{ZbVgeu*9fv<%Xs&;dfh&xY|
zmrBmD!W+9^iiJIQ;uBf>!qSSv+#%w`iMD5x8t?u2Jw<G?c8KTPaNns-(uUePMNhrd
xjRar%HLpE+ed}>Q`{bScY(OgnfS5^s!E{N+7Wr9i3;Y^N7W(|%{9A#Q9RO_0PAvcc

delta 220
zcmZn&Xb9Ml!@{=UoV;J@yU9f?ZH((S|73Z>%+_(-TQzFW=Eod9%#%%c?y=o-2?X*d
zOYla>@E>~xWZvLlVE7LOznK_UGcvF-Gcr!@<yB-`$N&P9^Mof(w&&}HYTbN+uZ5Kj
zqIYwYh&xY|z3xHYP4RpRe*-GBu4w-|)NZhyd-)9Mf8s`&6F$wc^5FTs_VdBbL5gM<
zzHX@zY`)CEd&Oz~QFBc>8K(2yaTVwJ*?_hP05Oy7)Vp1g^RASMKR<COe%=wq&A$~`
F*#YW|S?vG-

diff --git a/ReportesSIGPC/ReportesSIGPC/rpt_trabajoactividad.rdl b/ReportesSIGPC/ReportesSIGPC/rpt_trabajoactividad.rdl
index 7d0f400e5..0b99846d2 100644
--- a/ReportesSIGPC/ReportesSIGPC/rpt_trabajoactividad.rdl
+++ b/ReportesSIGPC/ReportesSIGPC/rpt_trabajoactividad.rdl
@@ -685,8 +685,8 @@
         <CommandText>PA_TRABAJOACTIVIDAD</CommandText>
       </Query>
       <Fields>
-        <Field Name="PKTRABAJOACTIVIDAD">
-          <DataField>PKTRABAJOACTIVIDAD</DataField>
+        <Field Name="ORDENACTIVIDAD">
+          <DataField>ORDENACTIVIDAD</DataField>
           <rd:TypeName>System.Int32</rd:TypeName>
         </Field>
         <Field Name="Actividad_en_que_se_encuentra_">
@@ -699,11 +699,11 @@
         </Field>
         <Field Name="Fecha_de_Inicio_Consulta">
           <DataField>Fecha de Inicio Consulta</DataField>
-          <rd:TypeName>System.String</rd:TypeName>
+          <rd:TypeName>System.DateTime</rd:TypeName>
         </Field>
         <Field Name="Fecha_de_Finalización_Consulta">
           <DataField>Fecha de Finalización Consulta</DataField>
-          <rd:TypeName>System.String</rd:TypeName>
+          <rd:TypeName>System.DateTime</rd:TypeName>
         </Field>
         <Field Name="Región">
           <DataField>Región</DataField>
@@ -719,7 +719,7 @@
         </Field>
         <Field Name="Duración_Promedio_por_solicitud">
           <DataField>Duración Promedio por solicitud</DataField>
-          <rd:TypeName>System.String</rd:TypeName>
+          <rd:TypeName>System.Int32</rd:TypeName>
         </Field>
       </Fields>
     </DataSet>
@@ -780,7 +780,7 @@ FROM            t_adm_region</CommandText>
         </Field>
       </Fields>
     </DataSet>
-    <DataSet Name="ds_Meses">
+    <DataSet Name="ds_Meses_Inicio">
       <Query>
         <DataSourceName>SIGPC</DataSourceName>
         <CommandText>WITH months(MonthNumber) AS
@@ -794,6 +794,38 @@ FROM            t_adm_region</CommandText>
 select MonthNumber, FORMAT(CAST('01/'+CONVERT(varchar,MonthNumber )+'/2000' as date) , 'MMMMM') as Mes
 from months
   WHERE MonthNumber &gt; 0
+  ORDER BY MonthNumber</CommandText>
+      </Query>
+      <Fields>
+        <Field Name="MonthNumber">
+          <DataField>MonthNumber</DataField>
+          <rd:TypeName>System.Int32</rd:TypeName>
+        </Field>
+        <Field Name="Mes">
+          <DataField>Mes</DataField>
+          <rd:TypeName>System.String</rd:TypeName>
+        </Field>
+      </Fields>
+    </DataSet>
+    <DataSet Name="ds_Meses_Final">
+      <Query>
+        <DataSourceName>SIGPC</DataSourceName>
+        <QueryParameters>
+          <QueryParameter Name="@MESINICIO">
+            <Value>=Parameters!MESINICIO.Value</Value>
+          </QueryParameter>
+        </QueryParameters>
+        <CommandText>WITH months(MonthNumber) AS
+(
+    SELECT 0
+    UNION ALL
+    SELECT MonthNumber+1 
+    FROM months
+    WHERE MonthNumber &lt; 12
+)
+select MonthNumber, FORMAT(CAST('01/'+CONVERT(varchar,MonthNumber )+'/2000' as date) , 'MMMMM') as Mes
+from months
+  WHERE MonthNumber &gt;= @MESINICIO
   ORDER BY MonthNumber</CommandText>
       </Query>
       <Fields>
@@ -834,7 +866,7 @@ from months
       <Prompt>Mes Inicio</Prompt>
       <ValidValues>
         <DataSetReference>
-          <DataSetName>ds_Meses</DataSetName>
+          <DataSetName>ds_Meses_Inicio</DataSetName>
           <ValueField>MonthNumber</ValueField>
           <LabelField>Mes</LabelField>
         </DataSetReference>
@@ -849,7 +881,7 @@ from months
       <Prompt>Mes Final</Prompt>
       <ValidValues>
         <DataSetReference>
-          <DataSetName>ds_Meses</DataSetName>
+          <DataSetName>ds_Meses_Final</DataSetName>
           <ValueField>MonthNumber</ValueField>
           <LabelField>Mes</LabelField>
         </DataSetReference>
diff --git a/ReportesSIGPC/ReportesSIGPC/rpt_trabajoactividad.rdl.data b/ReportesSIGPC/ReportesSIGPC/rpt_trabajoactividad.rdl.data
index d449befd2ed9d44c6bdb175cffb85b9c0ba1ea62..bc81273a347b323b0531202e34ba940a0dfb7c01 100644
GIT binary patch
delta 1090
zcmcIjT}V?=96#rJcelIEug&?@*DMS11KiLg5^A{_rp`?xQtacpUG3W3m3^q~!I_UG
zk~>5Xy%>xLR-{b`k{(JTq6ecO>p}Mr_R@os@DdiTbLM9F(o1yU9?tLgKmV`a`QI_y
zn0cn2f?Kop$8hR$UWj&OfelG}YV9M;0C*Ll06j`AD$ph!$SfrcMK%Dc5tMmhCEAeP
zp|=u=1iHoS-9F4P^>jVHf#Qswwva=fd<1Sy*}Wmf^3nCC)1Qw#|D+g)kc0ss0t?KR
zj^?v%wko5!uFlwcuG{3}y<9^(u`#^2s>W~(WwJ}?lCCHSL54aE!w^z8A&kR12w?=u
zcsK76B@!@<p}d#x@eqQPN(k8i=Lv`sX($P~9*^LX=oF*}xND*$OB?(BZb6ioKhTAt
zJOw$1>l3{`QBtG`rI#P{3H$&~D6uI{E;@XELMT%N>lTMncT{Q0DL7J;8dLO67wEc9
ziw^7ZgE5kG+d><w4Yd)dGA+!C`X)E_6akpVE{ax5M`M%K)WQPNJcKk%R*qFt{i6~=
zEZbkD_@7GP#9Bd&K(>|l>Kg?&=K>6*0Gib8LC19(l`^SB(trZ0Vwiz$s~)m!!xhmZ
z`uIL{T3xQlBZA;*L5-P<=)JaZKhap;!s#14{s0!!%n$NzC+~I$91hN)WwtD;QT9Xh
zOIHDJptAgteKk*;ld}o{9`NM)N#P)XVX)e0KEIf`NS+9w#T-MZV4TTnYd2f0Xrf><
zn0C#jSWR*;aV?s7mdW80h6E?))LUQ97znpxTnFIIbaTs+g0Q<le5Wxk871AsE_dk=
zsRY+WrVvC;MS4Zo1L13TY&7=+%e-2-`%E)e88c}fm7cu!jan@UAGpx{<;lBF|M0?(
zGxqc4+-m3RS;H`M-@dXk*LBcpyBafQlfNJbf0TOi#P^C9iR_6`WUX*Q*BhNLvB{!u
H^|kOfnu|$x

delta 2659
zcma)8-ESL35cj$lCr%tEaSCno(QFVcsG=x|K&?=ua&?^4X%ZiCTBNEHY|fkZ%K6s0
zkAApNw-q2HBvkbtc!Z$7ps1oK4}f?<@*mJQK;n%DUg$#*Vv&l}GGnjpgnkH1W8KYf
zW_D(G=QnqC>Z);PG8#_C66C>#9{q;g)a>Nut_xqh{rit(M<fz?eIzVvSE9cp!~0sf
zdlED+MBxv9V<BntNGANN?NjY}cn@#HhP0RP;ZAH)d+_k#!*DZ3>km8IFY*FF9ApLL
z49Hm!3*;QgJ0Lbl5ySxzASIAh5EsM)@j(KR^B@;ME`nSFDT7=Fc^BkC_(%J_u|IFm
zmowk}+;N={(7|t=q^2_Y<4ZZ?U_Sfmcy@gDw2?-28+Q(#$cO#$pF%S^nz%(s^kYIc
z$st0*Z+l+cSWl)&_vd7tbW9&#%*<qS3!zBv3NI(tVzHxc;F#gQ?gJHEg+z83x4`fj
z{S0?Zi_rq7y3Ni7+_ros(WC~and1wG+4N|@9pO>ka=9mQOA+pE!ZX5Nv3wylg><N3
zOtvdcs$qMQ&IHx9l4V1nj)u7rxRz%!TgH`UFt=ivmcwYnjV=YQ8!R(izf&2-be}uS
zlL>ea-|W6y>1kTeS;gvxBX=vyR;Gq9g;~8V_b8;97tLF%f#qWS0fqH7!(qy%RTOei
zL9LbMnGbo&Apk14Dg8|+BXE4k7c(4w#O;lMmxL$xDqu^3%ysb$Mjk;jUWvJ7CaFSN
zE9IF(7g@1_C66jJ+00{>nbi&XoYHS87`z~RE+jU@_5)2<H<p<r<UWP;WC|9Zh@g1}
z0F(O_(AT&@GXbj<m>rb3Jgl&7w=3|)ih$jv^0oiEV)_PKwuO94L9No#0*<7Bj&fOn
ziDqRvk4aN$ch6fD$71R}8_X^;mo5m`=MsAv%WIXM7QUd+5}w2!uN~XG<yf>)%p40`
zZcA)_1d~R<UGSK-irnF4iG+aq&c*6&LDM#Kg#>~)^2Ak;Ii8dOGD;l_@Ai&YkXZ0_
zdzDBvsNLPH-Kc))@-jWeZC=20M<RN<1=7^hEr7%-HIqG0T82s_xu-`#3Pg)m`_xYZ
zju4p<p@AtN64SIGak|LQSaps;imEV))QLuW5J8J$0f$DSx^Gw49N#jTL}o>kRO7%h
zp3hy&wxOkvakpVx`Vg5IvHr)bFOi~eRREpXg62xxW%WcaLAN--I9Ac(K#Oo$0!9tt
z!_DOqxg8_F^8bB3DBZIP0ni>!1@zuKRcUQZp1bF3EeHI2!V8#d35lZv4Yl-iR+l(L
z@NF<RolR#Kbeh%|mU0XF9G%PMY5G`pE|Zt<DWg_T%>k3A&(;|DiUQkpQ+Ph3(x@m+
zvbD7)D+ltb(l@u<VCR`fapUDRg#j7BmNcrOi|L%a9*!hOYQ#9CC>?xky2Q`Hi59pG
z(}20AkngJyP0pC&9xDRju>xc(KWME`A6UQ{kgg6)^x<P5MJEo-Bix@#YaR)uinr*#
zq*T50%yb1k1(%WLIM%hQke)3_tzcIHEk;>lHY+j*?xv@(ohPen-f93nS~$ch@EF7`
z2<Zc?K~Bv=w~gL)(ly0P+$q$m3^zN6!o!J_-lbQ+7BuVNb%;c8#K-3|`RoFmdM*yr
z940!^NNsMzGlnPQKu_~Pw{@p*I59Z<8xG?-tWAtfOn^l#?lcTAJ3P=eFo2U(SwzPH
zk7I;7e6Qyq`6L|Zy*T*yuSV^IB@%(JrrPhHD6ANXX(arrcYvG@uW1Kv_FeBx8ON6v
z^`rW1F8rwP{<96gzGysEPnASco8k98`%EYyCEIXmRK<a0U#5`ZSp5~4e9LS7Q-;-`
o$8X~HXau7~;^C+^yg~YDN61D$+xTIys}0gT65i0pw#fc}0UmQ$hX4Qo