Egalware/GPW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ancora fix grafici vari

Browse Source
This commit is contained in:
Samuele E. Locatelli
2021-01-09 08:43:32 +01:00
parent 8ffcc766f2
commit d4d8fdb689
7 changed files with 83 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GPW_Admin/WebUserControls/mod_adminProgetti.ascx
+7 -7
View File
@@ -13,19 +13,19 @@
<div class="col-4">
<uc1:cmp_periodoAnalisi runat="server" ID="cmp_periodoAnalisi" />
</div>
<div class="col-5 input-group-text">
<div class="row">
<div class="col">
<div class="col-5 input-group input-group-sm small">
<div class="d-flex input-group-text py-0">
<div class="px-2">
<asp:CheckBox ID="chkShowChiusi" runat="server" Text="Mostra Archiviati" OnCheckedChanged="chkShowChiusi_CheckedChanged" AutoPostBack="True" />
</div>
<div class="col">
<div class="px-2">
<asp:CheckBox ID="chkShowVuoti" runat="server" Text="Mostra Vuoti" AutoPostBack="True" OnCheckedChanged="chkShowVuoti_CheckedChanged" Checked="true" />
</div>
<div class="col">
<div class="px-2">
<asp:CheckBox ID="chkShowOnlyStarred" runat="server" Text="Mostra SOLO Starred" AutoPostBack="True" OnCheckedChanged="chkShowOnlyStarred_CheckedChanged" Checked="false" />
</div>
<div class="col">
<asp:LinkButton runat="server" ID="lbtResetFilt" ToolTip="Reset Filtro" OnClick="lbtResetFilt_Click" CssClass="btn btn-sm btn-block btn-outline-secondary"><i class="fa fa-refresh" aria-hidden="true"></i></asp:LinkButton>
<div class="px-2">
<asp:LinkButton runat="server" ID="lbtResetFilt" ToolTip="Reset Filtro" OnClick="lbtResetFilt_Click" CssClass="btn btn-sm btn-block btn-outline-secondary"><i class="fa fa-refresh" aria-hidden="true"></i> Reset</asp:LinkButton>
</div>
</div>
</div>
GPW_Admin/WebUserControls/mod_approvaTimbr.ascx
+3 -3
View File
@@ -2,12 +2,12 @@
<%@ Register Src="mod_filtro.ascx" TagName="mod_filtro" TagPrefix="uc1" %>
<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %>
<div class="row small">
<div class="col-6">
<div class="d-flex small table-secondary">
<div class="px-2">
<uc1:mod_filtro ID="filtroDip" runat="server" filterUnchekText="mostraTutti" filterChekText="filtraDip" />
<asp:ObjectDataSource ID="odsDip" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getAttivi" TypeName="GPW_data.DS_UtilityTableAdapters.v_selDipendentiTableAdapter"></asp:ObjectDataSource>
</div>
<div class="col-6">
<div class="px-2">
<label for="arrot">
Min. arrot.
</label>
GPW_Admin/WebUserControls/mod_filtro.ascx
+1 -1
View File
@@ -1,7 +1,7 @@
<%@ Control Language="C#" AutoEventWireup="true" Inherits="mod_filtro" CodeBehind="mod_filtro.ascx.cs" %>
<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %>
<div class="input-group">
<div class="input-group input-group-sm">
<div class="input-group-prepend">
<asp:CheckBox ID="chkFilt" runat="server" Checked="false" AutoPostBack="True" CssClass='input-group-text <%# css %>' OnCheckedChanged="chkFilt_CheckedChanged" />
</div>
GPW_Admin/WebUserControls/mod_spostaOre.ascx
+16 -8
View File
@@ -130,11 +130,11 @@
<b>
<asp:Label ID="lblUser" runat="server" Text='<%# Eval("CognomeNome") %>' /></b>
</div>
<div class="col-2 text-success textBig">
<div class="col-3 text-success text-right">
<b>
<asp:Label ID="lblOre" runat="server" Text='<%# Eval("oreTot","{0:0.##}") %>' /></b> h
</div>
<div class="col-5 text-center">
<div class="col-4 text-center small">
<div class="table-secondary border rounded">
<asp:Label ID="lblDay" runat="server" Text='<%# Eval("inizio","{0:dd/MM/yy}") %>' />
|
@@ -149,15 +149,23 @@
<asp:TemplateField HeaderText="Registro Attività">
<ItemTemplate>
<div class="row">
<div class="col-4">
<b>
<asp:Label ID="lblRagSociale" runat="server" Text='<%# Eval("RagSociale") %>' Font-Size="10pt" /></b><br />
<div class="col-3">
<div class="d-flex">
<div class="px-2 ">
<b>
<asp:Label ID="lblGruppo" runat="server" Text='<%# Eval("Gruppo") %>' CssClass="text-secondary" /></b> |
<b>
<asp:Label ID="lblRagSociale" runat="server" Text='<%# Eval("RagSociale") %>' /></b>
</div>
</div>
</div>
<div class="col-3 small">
<asp:Label ID="lblnomeProj" runat="server" Text='<%# Eval("nomeProj") %>' ForeColor="Blue" />
|
<asp:Label ID="lblnomeFase" runat="server" Text='<%# Eval("nomeFase") %>' ForeColor="Green" />
<asp:Label ID="lblnomeFase" runat="server" Text='<%# Eval("nomeFase") %>' ForeColor="Green" />
</div>
<div class="col-8 small">
<asp:Label ID="lbldescrizione" runat="server" Text='<%# Eval("descrizione").ToString().Replace(Environment.NewLine,"<br />").Replace("\n","<br />") %>' />
<div class="col-6 small">
<asp:Label ID="lbldescrizione" runat="server" Text='<%# Eval("descrizione").ToString().Replace(Environment.NewLine,", ").Replace("\n",", ") %>' />
</div>
</div>
</ItemTemplate>
GPW_Data/DS_Applicazione.Designer.cs
Generated
+30 -2
View File
@@ -8420,6 +8420,8 @@ namespace GPW_data {
private global::System.Data.DataColumn columnCognomeNome;
private global::System.Data.DataColumn columngruppo;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public regAttDayExplDataTable() {
@@ -8549,6 +8551,14 @@ namespace GPW_data {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn gruppoColumn {
get {
return this.columngruppo;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -8586,7 +8596,7 @@ namespace GPW_data {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public regAttDayExplRow AddregAttDayExplRow(int idxDipendente, System.DateTime inizio, System.DateTime fine, string descrizione, decimal oreTot, decimal importo, string RagSociale, string nomeProj, string nomeFase, decimal minTot, string CognomeNome) {
public regAttDayExplRow AddregAttDayExplRow(int idxDipendente, System.DateTime inizio, System.DateTime fine, string descrizione, decimal oreTot, decimal importo, string RagSociale, string nomeProj, string nomeFase, decimal minTot, string CognomeNome, string gruppo) {
regAttDayExplRow rowregAttDayExplRow = ((regAttDayExplRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
idxDipendente,
@@ -8600,7 +8610,8 @@ namespace GPW_data {
nomeFase,
minTot,
null,
CognomeNome};
CognomeNome,
gruppo};
rowregAttDayExplRow.ItemArray = columnValuesArray;
this.Rows.Add(rowregAttDayExplRow);
return rowregAttDayExplRow;
@@ -8642,6 +8653,7 @@ namespace GPW_data {
this.columnminTot = base.Columns["minTot"];
this.columnidxRA = base.Columns["idxRA"];
this.columnCognomeNome = base.Columns["CognomeNome"];
this.columngruppo = base.Columns["gruppo"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -8671,6 +8683,8 @@ namespace GPW_data {
base.Columns.Add(this.columnidxRA);
this.columnCognomeNome = new global::System.Data.DataColumn("CognomeNome", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnCognomeNome);
this.columngruppo = new global::System.Data.DataColumn("gruppo", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columngruppo);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnidxRA}, true));
this.columnidxDipendente.AllowDBNull = false;
@@ -8692,6 +8706,8 @@ namespace GPW_data {
this.columnidxRA.Unique = true;
this.columnCognomeNome.ReadOnly = true;
this.columnCognomeNome.MaxLength = 101;
this.columngruppo.AllowDBNull = false;
this.columngruppo.MaxLength = 50;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -16126,6 +16142,17 @@ namespace GPW_data {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public string gruppo {
get {
return ((string)(this[this.tableregAttDayExpl.gruppoColumn]));
}
set {
this[this.tableregAttDayExpl.gruppoColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsdescrizioneNull() {
@@ -30208,6 +30235,7 @@ SELECT dataLav, idxDipendente, codGiust, minuti FROM Giustificativi WHERE (codGi
tableMapping.ColumnMappings.Add("minTot", "minTot");
tableMapping.ColumnMappings.Add("idxRA", "idxRA");
tableMapping.ColumnMappings.Add("CognomeNome", "CognomeNome");
tableMapping.ColumnMappings.Add("gruppo", "gruppo");
this._adapter.TableMappings.Add(tableMapping);
}
GPW_Data/DS_Applicazione.xsd
+8
View File
@@ -2614,6 +2614,7 @@ SELECT dataLav, idxDipendente, codGiust, minuti FROM Giustificativi WHERE (codGi
<Mapping SourceColumn="minTot" DataSetColumn="minTot" />
<Mapping SourceColumn="idxRA" DataSetColumn="idxRA" />
<Mapping SourceColumn="CognomeNome" DataSetColumn="CognomeNome" />
<Mapping SourceColumn="gruppo" DataSetColumn="gruppo" />
</Mappings>
<Sources>
<DbSource ConnectionRef="GPWConnectionString (Settings)" DbObjectName="GPW.dbo.stp_RA_deleteQuery" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="deleteQuery" Modifier="Public" Name="deleteQuery" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="deleteQuery">
@@ -3662,6 +3663,13 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="gruppo" msprop:Generator_ColumnVarNameInTable="columngruppo" msprop:Generator_ColumnPropNameInRow="gruppo" msprop:Generator_ColumnPropNameInTable="gruppoColumn" msprop:Generator_UserColumnName="gruppo">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="50" />
</xs:restriction>
</xs:simpleType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
GPW_Data/DS_Applicazione.xss
+18 -18
View File
@@ -4,29 +4,29 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
</autogenerated>-->
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-2" ViewPortY="408" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-39" ViewPortY="200" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:Timbrature" ZOrder="26" X="279" Y="76" Height="267" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:TimbratureExpl" ZOrder="10" X="622" Y="64" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:TimbratureExpl" ZOrder="11" X="622" Y="64" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:AnagDevices" ZOrder="20" X="937" Y="134" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
<Shape ID="DesignTable:Dipendenti" ZOrder="2" X="279" Y="478" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:AnagClienti" ZOrder="4" X="1234" Y="528" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:AnagProgetti" ZOrder="3" X="886" Y="976" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:Dipendenti" ZOrder="3" X="279" Y="478" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:AnagClienti" ZOrder="5" X="1234" Y="528" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:AnagProgetti" ZOrder="4" X="886" Y="976" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:Dipendenti2Ruoli" ZOrder="25" X="579" Y="943" Height="153" Width="276" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
<Shape ID="DesignTable:AnagFasi" ZOrder="13" X="871" Y="528" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:v_logCommUt" ZOrder="7" X="1204" Y="1309" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:RegAttivita" ZOrder="5" X="598" Y="591" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
<Shape ID="DesignTable:CalendFesteFerie" ZOrder="11" X="597" Y="1126" Height="191" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
<Shape ID="DesignTable:AnagOrari" ZOrder="1" X="278" Y="1055" Height="362" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:AnagFasi" ZOrder="14" X="871" Y="528" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:v_logCommUt" ZOrder="8" X="1204" Y="1309" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:RegAttivita" ZOrder="6" X="598" Y="591" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
<Shape ID="DesignTable:CalendFesteFerie" ZOrder="12" X="597" Y="1126" Height="191" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
<Shape ID="DesignTable:AnagOrari" ZOrder="2" X="278" Y="1055" Height="362" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:TimbMeseExpl" ZOrder="19" X="1249" Y="134" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:Giustificativi" ZOrder="12" X="885" Y="1385" Height="229" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
<Shape ID="DesignTable:Giustificativi" ZOrder="13" X="885" Y="1385" Height="229" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
<Shape ID="DesignTable:stp_DipendentiAndAnomalie" ZOrder="18" X="82" Y="1313" Height="134" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
<Shape ID="DesignTable:TE_RA_Expl" ZOrder="15" X="-3" Y="176" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:regAttDayExpl" ZOrder="17" X="19" Y="886" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:AnagProgetti_Expl" ZOrder="16" X="1236" Y="992" Height="286" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
<Shape ID="DesignTable:RegistroEventi" ZOrder="14" X="85" Y="1476" Height="153" Width="229" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
<Shape ID="DesignTable:RilievoTemp" ZOrder="9" X="-29" Y="522" Height="191" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
<Shape ID="DesignTable:HistTemp" ZOrder="6" X="-26" Y="727" Height="115" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
<Shape ID="DesignTable:TE_RA_Expl" ZOrder="16" X="-3" Y="176" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:regAttDayExpl" ZOrder="1" X="-20" Y="883" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:AnagProgetti_Expl" ZOrder="17" X="1236" Y="992" Height="286" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
<Shape ID="DesignTable:RegistroEventi" ZOrder="15" X="85" Y="1476" Height="153" Width="229" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
<Shape ID="DesignTable:RilievoTemp" ZOrder="10" X="-29" Y="522" Height="191" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
<Shape ID="DesignTable:HistTemp" ZOrder="7" X="-26" Y="727" Height="115" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
</Shapes>
<Connectors>
<Connector ID="DesignRelation:FK_Timbrature_Dipendenti" ZOrder="27" LineWidth="11">
@@ -101,7 +101,7 @@
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:FK_RilievoTemp_Dipendenti" ZOrder="8" LineWidth="11">
<Connector ID="DesignRelation:FK_RilievoTemp_Dipendenti" ZOrder="9" LineWidth="11">
<RoutePoints>
<Point>
<X>279</X>