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

update vers 188

Browse Source 
- fix caricamento TUTTE le figure professionali x fasi
- fix gestione url offerta/ordine
This commit is contained in:
Samuele Locatelli
2013-09-03 16:52:42 +02:00
parent 92210f555b
commit 286ccd8bba
18 changed files with 77 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ETS-WS/ETS-WS/bin/ETS-DIP.dll
BIN
View File
Binary file not shown.
ETS-WS/ETS-WS/bin/ETS_Data.dll
BIN
View File
Binary file not shown.
ETS-WS/ReleaseClienti/ETS-WS.zip
BIN
View File
Binary file not shown.
ETS_Data/ETS_Data.csproj
+1
View File
@@ -154,6 +154,7 @@
<Content Include="SQL\ETS-DIP\ETS_WS_00137.sql" />
<Content Include="SQL\ETS-GPW\ETS_GPW-PROJ_00183.sql" />
<Content Include="SQL\ETS_anagrafica\ETS_ANAG_00170.sql" />
<Content Include="SQL\ETS_PROJ\ETS_PROJ_00187.sql" />
<Content Include="SQL\ETS_PROJ\ETS_PROJ_00183.sql" />
<Content Include="SQL\ETS_PROJ\ETS_PROJ_00172.sql" />
<Content Include="SQL\ETS_PROJ\ETS_PROJ_00170.sql" />
ETS_Data/bin/ETS/ETS_Data.dll
BIN
View File
Binary file not shown.
ETS_Data/bin/Release/ETS_Data.dll
BIN
View File
Binary file not shown.
ETS_Data/obj/ETS/DesignTimeResolveAssemblyReferencesInput.cache
BIN
View File
Binary file not shown.
ETS_Data/obj/ETS/ETS_Data.dll
BIN
View File
Binary file not shown.
PROJ-ETS/PROJ-ETS/Content/Style.css
+3
View File
@@ -1085,3 +1085,6 @@ div > ul > li > a.selected.menuNav {
vertical-align: middle;
}
/*#endregion */
.lblErrore {
color: #ff0000;
}
PROJ-ETS/PROJ-ETS/Content/Style.less
+3
View File
@@ -1210,3 +1210,6 @@ div > ul > li > a.selected.menuNav {
/*#endregion */
.lblErrore {
color: @rossoStart;
}
PROJ-ETS/PROJ-ETS/Content/Style.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
PROJ-ETS/PROJ-ETS/Web.config
+3 -2
View File
@@ -26,7 +26,7 @@
<add key="appName" value="PROJ-ETS"/>
<add key="SiteName" value="ETS"/>
<add key="mainRev" value="0.7"/>
<add key="minRev" value="187"/>
<add key="minRev" value="188"/>
<add key="stdEmail" value="info@steamware.net"/>
<add key="_safePages" value="Default.aspx#unauthorized.aspx#forceUser.aspx#login.aspx#test.aspx#Test.aspx"/>
<!--area gestione auth cookie-->
@@ -39,6 +39,7 @@
<!--gestione caricamento doc da ETS-DIP-->
<add key="urlEtsDip" value="http://iis01/DIP" />
<add key="urlPage" value="getDocByProto.aspx" />
<add key="urlPageArch" value="GestioneDocumenti.aspx" />
<add key="param" value="nrProto" />
<!--update pagina-->
<add key="intUpdatePagina_ms" value="120000"/>
@@ -46,7 +47,7 @@
<add key ="idxProgettoTemplate" value="2480"/>
<!--valori default x risorse-->
<add key ="codTipoRisorsaStd" value="DIS"/>
<add key ="oreBdgtStd" value="8"/>
<add key ="oreBdgtStd" value="1"/>
<!--area conf dataset classi esterne-->
<add key="ETS_WSConnectionString" value="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=ETS_WS;Persist Security Info=True;User ID=sa;Password=keyhammer"/>
<add key="ETS_AnagraficaConnectionString" value="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=ETS_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer"/>
PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx
+10 -8
View File
@@ -108,7 +108,7 @@
<asp:Label ID="lblhlOfferta" runat="server" Text="Offerta" AssociatedControlID="hlOfferta" />
</div>
<div class="divDx" style="width: 180px; text-align: right;">
<asp:HyperLink runat="server" ID="hlOfferta" NavigateUrl='<%# getUrlDoc(Eval("urlOfferta")) %>' ToolTip="Vai al documento dell'offerta" Text='<%# Eval("rifOfferta") %>' Font-Size="0.8em" CssClass="divDx docIcon" Target="_blank" />
<asp:HyperLink runat="server" ID="hlOfferta" NavigateUrl='<%# getUrlDoc(Eval("urlOfferta")) %>' ToolTip="Vai al documento dell'offerta" Text='<%# Eval("rifOfferta") %>' Font-Size="0.8em" CssClass="divDx docIcon" Target="_blank" Visible='<%# urlOk(Eval("urlOfferta")) %>'/>
</div>
</div>
<div class="clearDiv padStd" style="height: 1.1em;">
@@ -116,7 +116,7 @@
<asp:Label ID="Label1" runat="server" Text="Ordine" AssociatedControlID="hlOrdine" />
</div>
<div class="divDx" style="width: 180px; text-align: right;">
<asp:HyperLink runat="server" ID="hlOrdine" NavigateUrl='<%# getUrlDoc(Eval("urlOrdine")) %>' ToolTip="Vai al documento dell'ordine" Text='<%# Eval("rifOrdine") %>' Font-Size="0.8em" CssClass="divDx docIcon" Target="_blank" />
<asp:HyperLink runat="server" ID="hlOrdine" NavigateUrl='<%# getUrlDoc(Eval("urlOrdine")) %>' ToolTip="Vai al documento dell'ordine" Text='<%# Eval("rifOrdine") %>' Font-Size="0.8em" CssClass="divDx docIcon" Target="_blank" Visible='<%# urlOk(Eval("urlOrdine")) %>' />
</div>
</div>
</div>
@@ -231,12 +231,13 @@
</div>
</div>
<div class="clearDiv padStd" style="border-top: 1px dotted #CDCDCD;">
<div class="clearDiv padStd" style="height: 1.1em; font-size:0.8em;">
<div class="clearDiv padStd" style="height: 1.1em; font-size: 0.8em;">
<div class="divSx">
<asp:HyperLink runat="server" ID="hlOfferta" Target="_blank" NavigateUrl='<%# getUrlArchivioDocs %>' Text="Offerta nr." ToolTip="Vai su archivio documenti" Font-Size="8pt" />
</div>
<div class="divDx" style="width: 180px; text-align: right; font-size: 0.6em;">
<asp:TextBox runat="server" ID="txtUrlOfferta" Text='<%# Bind("urlOfferta") %>' Width="11em" BorderWidth="1px" CssClass="divDx bordoAzzurro" ToolTip="inserire protocollo formato num-anno" />
<asp:TextBox runat="server" ID="txtUrlOfferta" Text='<%# Bind("urlOfferta") %>' Width="11em" BorderWidth="1px" CssClass="divDx bordoAzzurro" ToolTip="inserire protocollo formato num-anno" TextMode="Search" />
<asp:RegularExpressionValidator ID="revOfferta" runat="server" ErrorMessage="!!!" ControlToValidate="txtUrlOfferta" ValidationExpression="\d{1,5}-\d{2,4}" CssClass="lblErrore" ToolTip="Numero-Anno" Font-Size="7pt" />
</div>
<div class="clearDiv divSx">
<asp:Label ID="lblRifOfferta" runat="server" Text="Descr Offerta" AssociatedControlID="txtRifOfferta" />
@@ -245,15 +246,16 @@
<asp:TextBox runat="server" ID="txtRifOfferta" Text='<%# Bind("rifOfferta") %>' TextMode="MultiLine" Height="3em" Width="11em" BorderWidth="1px" CssClass="divDx bordoAzzurro" ToolTip="Descrizione (es Offerta num-anno del gg/mm/anno)" />
</div>
</div>
<div class="clearDiv padStd" style="height: 1.1em; font-size:0.8em;">
<div class="clearDiv padStd" style="height: 1.1em; font-size: 0.8em;">
<div class="divSx">
<asp:HyperLink runat="server" ID="hlOrdine" Target="_blank" NavigateUrl='<%# getUrlArchivioDocs %>' Text="Ordine nr." ToolTip="Vai su archivio documenti" Font-Size="8pt" />
</div>
<div class="divDx" style="width: 180px; text-align: right; font-size: 0.6em;">
<asp:TextBox runat="server" ID="txtUrlOrdine" Text='<%# Bind("urlOrdine") %>' Width="11em" BorderWidth="1px" CssClass="divDx bordoAzzurro" />
<asp:TextBox runat="server" ID="txtUrlOrdine" Text='<%# Bind("urlOrdine") %>' Width="11em" BorderWidth="1px" CssClass="divDx bordoAzzurro" ToolTip="inserire protocollo formato num-anno" TextMode="Search" />
<asp:RegularExpressionValidator ID="revOrdine" runat="server" ErrorMessage="!!!" ControlToValidate="txtUrlOrdine" ValidationExpression="\d{1,5}-\d{2,4}" CssClass="lblErrore" ToolTip="Numero-Anno" Font-Size="7pt" />
</div>
<div class="clearDiv divSx">
<asp:Label ID="lblRifOrdine" runat="server" Text="Ordine" AssociatedControlID="txtRifOrdine" />
<asp:Label ID="lblRifOrdine" runat="server" Text="Descr Ordine" AssociatedControlID="txtRifOrdine" />
</div>
<div class="divDx" style="width: 180px; text-align: right; font-size: 0.5em;">
<asp:TextBox runat="server" ID="txtRifOrdine" Text='<%# Bind("rifOrdine") %>' TextMode="MultiLine" Height="3em" Width="11em" BorderWidth="1px" CssClass="divDx bordoAzzurro" ToolTip="Descrizione (es Offerta num-anno del gg/mm/anno)" />
@@ -274,7 +276,7 @@
</div>
</EditItemTemplate>
</asp:FormView>
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="GetData" TypeName="ETS_Data.Ds_ProjEtsTableAdapters.DatiCommessaTableAdapter" UpdateMethod="Update">
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="GetData" TypeName="ETS_Data.Ds_ProjEtsTableAdapters.DatiCommessaTableAdapter" UpdateMethod="Update" OnUpdating="ods_Updating">
<SelectParameters>
<asp:SessionParameter Name="idxFase" Type="Int32" SessionField="idxFase_sel" />
</SelectParameters>
PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx.cs
+50 -6
View File
@@ -4,6 +4,7 @@ using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using ETS_Data;
namespace PROJ_ETS.WebUserControls
{
@@ -31,9 +32,9 @@ namespace PROJ_ETS.WebUserControls
string answ = "";
try
{
string urlEtsDip = "http://iis01/DIP";
string urlPage = "getDocByProto.aspx";
string param = "nrProto";
string urlEtsDip = utils.obj.confReadString("urlEtsDip");
string urlPage = utils.obj.confReadString("urlPage");
string param = utils.obj.confReadString("param");
answ = string.Format(@"{0}/{1}?{2}={3}", urlEtsDip, urlPage, param, urlDoc);
}
catch
@@ -53,14 +54,57 @@ namespace PROJ_ETS.WebUserControls
string answ = "";
try
{
string urlEtsDip = "http://iis01/DIP";
string urlPage = "GestioneDocumenti.aspx";
answ = string.Format(@"{0}/{1}", urlEtsDip, urlPage);
string urlEtsDip = utils.obj.confReadString("urlEtsDip");
string urlPageArch = utils.obj.confReadString("urlPageArch");
answ = string.Format(@"{0}/{1}", urlEtsDip, urlPageArch);
}
catch
{ }
return answ;
}
}
/// <summary>
/// in fase di update...
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void ods_Updating(object sender, ObjectDataSourceMethodEventArgs e)
{
// controllo: se mancano descrizioni x offerta/ordine prendo numero protocollo
if (e.InputParameters["rifOfferta"] == null)
{
e.InputParameters["rifOfferta"] = e.InputParameters["urlOfferta"];
}
if (e.InputParameters["rifOrdine"] == null)
{
e.InputParameters["rifOrdine"] = e.InputParameters["urlOrdine"];
}
// se vuoto num protocollo cancello testo...
if (e.InputParameters["urlOfferta"] == null)
{
e.InputParameters["rifOfferta"] = "";
}
if (e.InputParameters["urlOrdine"] == null)
{
e.InputParameters["rifOrdine"] = "";
}
}
/// <summary>
/// definisce visibilità da URL (se presente è ok)
/// </summary>
/// <param name="url"></param>
/// <returns></returns>
public bool urlOk(object url)
{
bool answ = false;
try
{
answ = url.ToString() != "";
}
catch
{ }
return answ;
}
}
}
PROJ-ETS/PROJ-ETS/WebUserControls/mod_fasi.ascx.cs
+6 -2
View File
@@ -96,7 +96,11 @@ namespace PROJ_ETS.WebUserControls
/// <param name="e"></param>
protected void btnNewBdgtEmpty_Click(object sender, EventArgs e)
{
insertNewOne();
int idxFase = utils.obj.IntSessionObj("idxFaseDet_sel");
while (codTipoRisorsaFree(idxFase) != "")
{
insertNewOne();
}
}
/// <summary>
/// inserisce nuovo record e fa refresh
@@ -122,7 +126,7 @@ namespace PROJ_ETS.WebUserControls
}
catch
{
answ = utils.obj.confReadString("codTipoRisorsaStd");
//answ = utils.obj.confReadString("codTipoRisorsaStd");
}
return answ;
}
PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll
BIN
View File
Binary file not shown.
PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll
BIN
View File
Binary file not shown.
PROJ-ETS/ReleaseClienti/ETS/PROJ-ETS.zip
BIN
View File
Binary file not shown.