AdminADS/SIG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.10.111:8383/SIG

Browse Source
This commit is contained in:
rrene
2024-04-13 13:18:43 -07:00
parent fbfffac3ee 87f7ff34ef
commit 95ef3ad6e9
2 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Transportes/RepContratosCalendario.aspx
View File

@@ -280,17 +280,8 @@
<ajax:TabPanel ID="TabGrantt" runat="server" HeaderText="Cronograma"> <ajax:TabPanel ID="TabGrantt" runat="server" HeaderText="Cronograma">
<ContentTemplate> <ContentTemplate>
<div class="row"> <div class="row">
<div class="col-md-12 col-sm-12"> <div class="col-md-12">
<div class="portlet light calendar "> <div id="chartdiv">
<div class="tipo_vista">
<div>
<h4 class="bold ribbon-color-success">&nbsp;</h4>
</div>
</div>
<div class="portlet-body">
<div id="chartdiv">
</div>
</div>
</div> </div>
</div> </div>
</div> </div>

12
Transportes/RepContratosCalendario.aspx.vb
View File

@@ -63,8 +63,8 @@ Partial Class RepContratosCalendario
If DtAvance IsNot Nothing Then If DtAvance IsNot Nothing Then
For Each Row As DataRow In DtAvance.Rows For Each Row As DataRow In DtAvance.Rows
If String.IsNullOrEmpty(Row("NoSerie").ToString()) Then If String.IsNullOrEmpty(Row("CodigoAF").ToString()) Then
Row("NoSerie") = "Unidad no asignada" Row("CodigoAF") = "Unidad no asignada"
End If End If
Next Next
@@ -74,9 +74,9 @@ Partial Class RepContratosCalendario
Dim random = New Random() Dim random = New Random()
'DATOS 'DATOS
For Each Row As DataRow In DtAvance.FiltraParametros("NoSerie <> ''").Rows For Each Row As DataRow In DtAvance.FiltraParametros("CodigoAF <> ''").Rows
Dim obj As New JObject( Dim obj As New JObject(
New JProperty("category", Row("NoSerie")), New JProperty("category", Row("CodigoAF")),
New JProperty("fromDate", Row("FechaInicial").ToString().ToDateTime().ToString("dd/MM/yyyy HH:mm").ToDateTime()), New JProperty("fromDate", Row("FechaInicial").ToString().ToDateTime().ToString("dd/MM/yyyy HH:mm").ToDateTime()),
New JProperty("toDate", Row("FechaFinal").ToString().ToDateTime().ToString("dd/MM/yyyy HH:mm").ToDateTime()), New JProperty("toDate", Row("FechaFinal").ToString().ToDateTime().ToString("dd/MM/yyyy HH:mm").ToDateTime()),
New JProperty("columnSettings", New JObject( New JProperty("columnSettings", New JObject(
@@ -88,9 +88,9 @@ Partial Class RepContratosCalendario
Next Next
'CATEGORIAS 'CATEGORIAS
For Each Row As DataRow In DtAvance.FiltraParametros("NoSerie <> ''", "", {"NoSerie"}).Rows For Each Row As DataRow In DtAvance.FiltraParametros("CodigoAF <> ''", "", {"CodigoAF"}).Rows
Dim obj As New JObject( Dim obj As New JObject(
New JProperty("category", Row("NoSerie")) New JProperty("category", Row("CodigoAF"))
) )
jsonCategorias.Add(obj) jsonCategorias.Add(obj)
Next Next