(LAB-187)Req. Excel de todo el SIL que se abre en formato viejo.

Business/Business.csproj

@@ -56,6 +56,9 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="EPPlus">
+      <HintPath>..\packages\EPPlus.4.5.3.3\lib\net40\EPPlus.dll</HintPath>
+    </Reference>
     <Reference Include="Iesi.Collections, Version=1.0.0.1, Culture=neutral, PublicKeyToken=154fdcb44c4484fc">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Referencias\Iesi.Collections.dll</HintPath>

Business/packages.config

@@ -3,6 +3,7 @@
   <package id="Antlr" version="3.1.1" targetFramework="net35" />
   <package id="Castle.Core" version="1.1.0" targetFramework="net35" />
   <package id="Castle.DynamicProxy" version="2.1.0" targetFramework="net35" />
+  <package id="EPPlus" version="4.5.3.3" targetFramework="net45" />
   <package id="Iesi.Collections" version="1.0.1" targetFramework="net35" />
   <package id="log4net" version="1.2.10" targetFramework="net35" />
   <package id="NHibernate" version="2.1.2.4000" targetFramework="net35" />

ImprimeLocal/ImprimeLocal.csproj

@@ -130,12 +130,6 @@
       <SubType>Designer</SubType>
     </None>
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Business\Business.csproj">
-      <Project>{4bec40cc-9614-4e0e-8f4a-dc7c933425bc}</Project>
-      <Name>Business</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.5.2">
       <Visible>False</Visible>
@@ -148,6 +142,12 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Business\Business.csproj">
+      <Project>{4bec40cc-9614-4e0e-8f4a-dc7c933425bc}</Project>
+      <Name>Business</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

WebLab/Agendas/AgendaEdit.aspx

@@ -141,7 +141,7 @@
                                     <asp:ListItem Value="1">Dias habiles</asp:ListItem>
                                 </Items>
                             </anthem:RadioButtonList>
-
+                                 </td>       
 					</tr>
 					<tr>
 						<td>&nbsp;</td>
@@ -158,7 +158,7 @@
                                     <asp:ListItem Value="0">Domingo</asp:ListItem>
                                 </Items>
                             </anthem:CheckBoxList>
-
+                                  </td>            
 					</tr>
 					<tr>
 						<td  >Hora Desde:<span style="font-weight:bold"><asp:RequiredFieldValidator 

WebLab/Agendas/AgendaEdit.aspx.cs

@@ -1,7 +1,14 @@
-using System;
+using Business;
+using Business.Data;
+using Business.Data.Laboratorio;
+using NHibernate;
+using NHibernate.Expression;
+using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Configuration;
 using System.Data;
+using System.Data.SqlClient;
 using System.Linq;
 using System.Web;
 using System.Web.Security;
@@ -10,12 +17,6 @@
 using System.Web.UI.WebControls;
 using System.Web.UI.WebControls.WebParts;
 using System.Xml.Linq;
-using Business;
-using Business.Data.Laboratorio;
-using Business.Data;
-using NHibernate;
-using NHibernate.Expression;
-using System.Data.SqlClient;
 
 namespace WebLab.Agendas
 {
@@ -72,8 +73,16 @@ private void MostrarDatos()
             {
                 ddlEfector.SelectedValue = oRegistro.IdEfectorSolicitante.IdEfector.ToString();
                 cboTipoServicio.SelectedValue = oRegistro.IdTipoServicio.IdTipoServicio.ToString();
+
                 txtFechaDesde.Value = oRegistro.FechaDesde.ToShortDateString();
                 txtFechaHasta.Value = oRegistro.FechaHasta.ToShortDateString();
+
+                //Por defecto los items se los carga con cboTipoServicio.SelectedValue = 1
+                //Por eso cuando el item no es LABORATORIO no trae la Practica porque no es de tipo 1
+                if (cboTipoServicio.SelectedValue != "1")
+                {
+                    CargarItems(); //Lo recargo con el cboTipoServicio de la agenda
+                }
                 ddlItem.SelectedValue = oRegistro.IdItem.ToString();
 
                 AgendaDia oItem = new AgendaDia();
@@ -306,13 +315,38 @@ protected void customValidadorGeneral_ServerValidate(object source, ServerValida
                 if (Request["id"] != null) //Sacar el id de la agenda si es modificacion
                     crit.Add(Expression.Not(Expression.Eq("IdAgenda", int.Parse(Request["id"]))));
 
-                IList items = crit.List();
-
-                if (items.Count > 0)
+                // validar días seleccionados
+                List<int> diasSeleccionados = new List<int>();
+                for (int i=0; i<cklDias.Items.Count; i++)
+                {
+                    if (cklDias.Items[i].Selected) diasSeleccionados.Add(int.Parse(cklDias.Items[i].Value));
+                }
+
+                string dias = string.Join(",", diasSeleccionados);
+                if (dias != "") { 
+                    crit.Add(Expression.Sql(
+                        @"exists (
+                            select 1
+                            from LAB_AgendaDia D
+                            where D.idAgenda = {alias}.idAgenda
+                            and D.dia in (" + dias + @")
+                        )"
+                     ));
+                    IList items = crit.List();
+
+                    if (items.Count > 0)
+                    {
+                        args.IsValid = false;
+                        this.customValidadorGeneral.ErrorMessage = "Existe superposición de fechas con otra agenda";
+                    }
+                }
+                else
                 {
                     args.IsValid = false;
-                    this.customValidadorGeneral.ErrorMessage = "Existe superposición de fechas con otra agenda";
+                    this.customValidadorGeneral.ErrorMessage = "Error ingrese dias de atencion";
+
                 }
+
             }
         }
     }