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
2023-10-19 13:16:24 -07:00
parent 822282e878 9e9f4fa9b7
commit 3702d70da5
16 changed files with 117 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
Contabilidad2/RepEstadoResultadosHorizontal.aspx
View File

@@ -7,12 +7,12 @@
<style>
#chartdiv {
width: 100%;
height: 500px;
height: 400px;
}
#chartdivgral {
width: 100%;
min-height: 500px;
min-height: 400px;
}
.fa.fa-bar-chart {
@@ -1231,6 +1231,11 @@
<asp:HyperLink ID="HLAnterior" runat="server" Text='<%# Eval("ImporteAcumulado", "{0:N2}")%>' CssClass="Texto" Target="_blank"></asp:HyperLink>
</ItemTemplate>
<ItemStyle Width="150px" HorizontalAlign="Right" />
</asp:TemplateField>
<asp:TemplateField HeaderText="%" ItemStyle-Width="30px" ItemStyle-Font-Size="10px" >
<ItemTemplate>
<asp:Label ID="LblPorcentajeAcumualdo" runat="server" Text='<%# Eval("PorcentajeAcumulado", "{0:N2}")%>' CssClass="Texto" Target="_blank"></asp:Label>
</ItemTemplate>
</asp:TemplateField>
<%--<asp:BoundField HeaderText="%" DataField="PorcentajeAcumulado" DataFormatString="{0:N2}" ItemStyle-Width="100px" />--%>
</Columns>
@@ -1407,7 +1412,15 @@
</ItemTemplate>
<ItemStyle Width="150px" HorizontalAlign="Right" />
</asp:TemplateField>
<asp:BoundField HeaderText="%" DataField="PorcentajeAcumulado" DataFormatString="{0:N2}" ItemStyle-Width="30px" ItemStyle-Font-Size="10px" />
<asp:TemplateField HeaderText="%" ItemStyle-Width="30px" ItemStyle-Font-Size="10px" >
<ItemTemplate>
<asp:Label ID="LblPorcentajeAcumualdo" runat="server" Text='<%# Eval("PorcentajeAcumulado", "{0:N2}")%>' CssClass="Texto" Target="_blank"></asp:Label>
</ItemTemplate>
<ItemStyle Width="150px" HorizontalAlign="Right" />
</asp:TemplateField>
<%--<asp:BoundField HeaderText="%" DataField="PorcentajeAcumulado" DataFormatString="{0:N2}" />--%>
</Columns>
</asp:GridView>
@@ -1528,10 +1541,12 @@
}
function CargaGraficaBarras() {
let data = cdatos;
let newData = JSON.parse(JSON.stringify(data));
newData.sort((a, b) => a.Valor - b.Valor);
var chart = AmCharts.makeChart("chartdiv", {
"type": "serial",
"theme": "light",
"dataProvider": data,
"dataProvider": newData,
"startDuration": 2,
"valueAxes": [{
"position": "left",
@@ -1565,11 +1580,21 @@
function CargaGraficaPastel() {
let data = cdatos;
let newData = JSON.parse(JSON.stringify(data));
newData = newData.map(function (item) {
if (item.Valor < 0) {
item.Valor = Math.abs(item.Valor);
}
return item;
});
newData.sort((a, b) => b.Valor - a.Valor );
//console.log(newData);
var chart = AmCharts.makeChart("chartdiv", {
"type": "pie",
"theme": "light",
"dataProvider":
data,
newData,
"valueField": "Valor",
"titleField": "Texto",
"outlineAlpha": 0.4,
@@ -1583,11 +1608,17 @@
}
function ADSBegin() {
$('.DdlGrafica').on('select2:select', function (e) {
var data = e.params.data;
currentid = data.id;
if (currentid == 1) {
$("#chartdiv").css("height", "400px");
$("#chartdivgral").css("height", "400px");
CargaGraficaBarras();
} else {
$("#chartdiv").css("height", "700px");
$("#chartdivgral").css("height", "700px");
CargaGraficaPastel();
}
});
@@ -1752,7 +1783,9 @@
});
}
}
function initamgrafica() {
AmCharts.addInitHandler(function (chart) {
function handleCustomMarkerToggle(legendEvent) {
var dataProvider = legendEvent.chart.dataProvider;