Site.master.vb

@@ -1,12 +1,14 @@
 Option Explicit On
 Option Strict On
 
+Imports System.Activities.Statements
 Imports System.Data
 Imports System.IO
 Imports System.Security.Cryptography.X509Certificates
 Imports ADSNetLibrary.SIGAPI.Services.SAT.DescargaCFDI
 Imports DocumentFormat.OpenXml.Math
 Imports DocumentFormat.OpenXml.Packaging
+Imports DocumentFormat.OpenXml.Spreadsheet
 Imports Extensiones
 'Imports Microsoft.AspNet.SignalR.Client
 'Imports ChatHub
@@ -305,22 +307,6 @@ Partial Class Site
     '    dt.ReadXml(String.Format("{0}\Menu\ERP\{1}_Conf.xml", AppDomain.CurrentDomain.BaseDirectory, UsuarioActual.CveUsuario))
 
     'End Sub
-    Public Class MenuModal
-        Public Sub New()
-            HeaderBar = New StringBuilder("<li><i class='fa fa-home'></i><a href='/Inicio.aspx'>Inicio</a></li>")
-            MenuHTML = New StringBuilder()
-        End Sub
-
-        Property CveModuloSeleccionado As Integer
-        Property CveModuloSeleccionadoPadre As Integer
-        Property dt As DataTable
-
-        Property HeaderBar As StringBuilder
-        Property MenuHTML As StringBuilder
-        Property ScriptColorGrupoModulo As String
-
-
-    End Class
     Private Function ArmarMenu(CveModulo As Integer, ByRef menuobj As MenuModal) As MenuModal
         Dim listaModulos As EnumerableRowCollection(Of DataRow) = From i In menuobj.dt.AsEnumerable Where i!CvePadre.Equals(CveModulo) Order By i!Orden
         Dim cveModuloActual As Integer
@@ -329,7 +315,8 @@ Partial Class Site
         Dim estilo As String
         For Each drP As DataRow In listaModulos
             cveModuloActual = drP("CveModulo").ToString().ToEntero()
-            liga = If(drP("PopUp").ToString() = "S", String.Format("javascript:AbrirVentana('{0}',{1},{2},'N');", drP("LIGA"), drP("ANCHO"), drP("ALTO")), drP("LIGA").ToString())
+
+            liga = If(drP("PopUp").ToString() = "S", String.Format("javascript:AbrirVentana('{0}',{1},{2},'N');", drP("LIGA"), drP("ANCHO"), drP("ALTO")), If(drP("IsAngular").ToString() = "1", String.Format("{1}:84{0}", drP("LIGA"), menuobj.strdomain), drP("LIGA").ToString()))
             modulo = drP("Modulo").ToString()
             estilo = If(drP("Estilo").ToString() <> "", String.Format("<i class='{0}'></i>", drP("Estilo")), "")
 
@@ -340,11 +327,15 @@ Partial Class Site
             End If
 
             menuobj.MenuHTML.AppendFormat("<li><a id='m{0}' href=""{1}"">{2}<span class='title'>{3}</span>", cveModuloActual, liga, estilo, modulo)
+
+
             drP.Delete()
             menuobj.dt.AcceptChanges()
             If menuobj.dt.COUNT("CveModulo", String.Format("CvePadre ={0}", cveModuloActual)) > 0 Then
                 menuobj.MenuHTML.AppendFormat("<span id='j{0}'></span><span class='arrow '></span></a><ul class='sub-menu'>", cveModuloActual)
+                menuobj.modpadres.Add(modulo.RemoveDiacritics())
                 menuobj = ArmarMenu(cveModuloActual, menuobj)
+                menuobj.modpadres.RemoveAt(menuobj.modpadres.Count - 1)
 
                 If menuobj.CveModuloSeleccionadoPadre = cveModuloActual Then
 
@@ -358,11 +349,19 @@ Partial Class Site
                     menuobj.HeaderBar.AppendFormat("<li><i class='fa fa-angle-right'></i><a href='{0}'>{1}</a></li>", liga, modulo)
                     menuobj.CveModuloSeleccionadoPadre = CveModulo
                 End If
-                menuobj.MenuHTML.AppendFormat("</ul>")
+                menuobj.MenuHTML.Append("</ul>")
             Else
-                menuobj.MenuHTML.AppendFormat("</a>")
+                menuobj.MenuHTML.Append("</a>")
             End If
-            menuobj.MenuHTML.AppendFormat("</li>")
+
+            menuobj.MenuHTML.AppendFormat("<a class='dnone'>{0}", modulo.RemoveDiacritics())
+            For Each items As String In menuobj.modpadres
+                menuobj.MenuHTML.Append("-")
+                menuobj.MenuHTML.AppendFormat("{0}", items)
+
+            Next
+            menuobj.MenuHTML.Append("</a>")
+            menuobj.MenuHTML.Append("</li>")
         Next
         Return menuobj
 
@@ -393,13 +392,13 @@ Partial Class Site
         Dim menuobj = New MenuModal()
         menuobj.dt = dt
         menuobj.CveModuloSeleccionado = CveModulomasterpage.Text.ToEntero()
+        menuobj.strdomain = Request.Url.AbsoluteUri.Replace(Request.Url.PathAndQuery, "").Replace("https://", "http://")
+        If Request.Url.Port <> 80 Then
+            menuobj.strdomain = menuobj.strdomain.Replace(String.Format(":{0}", Request.Url.Port), "")
+        End If
         Dim newmenuobj As MenuModal = ArmarMenu(0, menuobj)
 
 
-        Dim strdomain = Request.Url.AbsoluteUri.Replace(Request.Url.PathAndQuery, "").Replace("https://", "http://")
-        If Request.Url.Port <> 80 Then
-            strdomain = strdomain.Replace(String.Format(":{0}", Request.Url.Port), "")
-        End If
         'Dim MenuHTML As New StringBuilder
         'For Each drP As DataRow In Inicio
         '    CveModuloPadre = drP("CveModulo").ToString().ToEntero()
@@ -702,8 +701,4 @@ Partial Class Site
         Catch ex As Exception
         End Try
     End Sub
-End Class
-Public Class TipoCambioActual
-    Public Fecha As Date
-    Public TipoCambio As Decimal
 End Class