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

fix elementi x commessa...

Browse Source
This commit is contained in:
Samuele Locatelli
2013-05-24 09:20:11 +02:00
parent 064374cacb
commit 52fd6a2e37
12 changed files with 86 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ETS_Data/obj/Debug/ETS_Data.dll
BIN
View File
Binary file not shown.
PROJ-ETS/PROJ-ETS/Content/Style.css
+18
View File
@@ -287,6 +287,24 @@ div > ul > li > a.selected.menuNav {
border-width: 1px 1px 1px 1px;
}
/* end zona menu */
/* zona placard valori */
.roundedCorner {
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
border-radius: 4px;
}
.padStd {
padding: 4px;
}
.bordoGrigio {
padding: 4px;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
border-radius: 4px;
border: 2px solid #696969;
background-color: #ECECEC;
}
/* end zona placard*/
/* zona colorazione filtri */
.filtro_1 {
background-color: #8888ff;
PROJ-ETS/PROJ-ETS/Content/Style.less
+50 -32
View File
@@ -109,8 +109,8 @@ A:hover {
font-size: 10pt;
font-family: Arial;
}
.btnMoveBig
{
.btnMoveBig {
background-image: url(../images/InOutArrows_l.png);
background-repeat: no-repeat;
background-position: right;
@@ -118,8 +118,8 @@ A:hover {
padding: 8px;
padding-right: 32px;
}
.btnEditBig
{
.btnEditBig {
background-image: url(../images/edit_l.png);
background-repeat: no-repeat;
background-position: right;
@@ -127,8 +127,8 @@ A:hover {
padding: 4px;
padding-right: 28px;
}
.btnEdit
{
.btnEdit {
background-image: url(../images/edit_m.png);
background-repeat: no-repeat;
background-position: right;
@@ -136,8 +136,8 @@ A:hover {
padding: 4px;
padding-right: 28px;
}
.btnClonaBig
{
.btnClonaBig {
background-image: url(../images/clonaObj_l.png);
background-repeat: no-repeat;
background-position: right;
@@ -145,8 +145,8 @@ A:hover {
padding: 4px;
padding-right: 28px;
}
.btnClona
{
.btnClona {
background-image: url(../images/clonaObj_m.png);
background-repeat: no-repeat;
background-position: right;
@@ -154,20 +154,19 @@ A:hover {
padding: 4px;
padding-right: 28px;
}
.btnRosso
{
.btnRosso {
border: solid 2px red;
background-color: #FFAAAA;
width: 100%;
text-align: center;
}
.btnRossoGrad
{
.btnRossoGrad {
border: solid 2px red;
background-color: #FFAAAA;
width: 100%;
text-align: center;
background-image: -webkit-gradient(linear,left top,left bottom,from( #FFAAAA ),to( #994444 ));
background-image: -webkit-linear-gradient( #FFAAAA,#994444 );
background-image: -moz-linear-gradient( #FFAAAA,#994444 );
@@ -175,44 +174,41 @@ A:hover {
background-image: -o-linear-gradient( #FFAAAA,#994444 );
background-image: linear-gradient( #FFAAAA,#994444 );
}
.btnArancio
{
.btnArancio {
border: solid 2px #998800;
background-color: #FFEE66;
width: 100%;
text-align: center;
}
.btnVerde
{
.btnVerde {
border: solid 2px green;
background-color: #AAFFAA;
width: 100%;
text-align: center;
}
.btnVerdeGrad
{
.btnVerdeGrad {
border: solid 2px green;
background-color: #AAFFAA;
text-align: center;
background-image: -webkit-gradient(linear,left top,left bottom,from( #AAFFAA ),to( #449944 ));
background-image: -webkit-linear-gradient( #AAFFAA,#449944 );
background-image: -moz-linear-gradient( #AAFFAA,#449944 );
background-image: -ms-linear-gradient( #AAFFAA,#449944 );
background-image: -o-linear-gradient( #AAFFAA,#449944 );
background-image: linear-gradient( #AAFFAA,#449944 );
}
.btnBlu
{
.btnBlu {
border: solid 2px blue;
background-color: #AAAAFF;
width: 100%;
text-align: center;
}
.btnPreferred
{
.btnPreferred {
font-size: 3em;
border: solid 4px red;
background-color: #FFACAC;
@@ -222,8 +218,8 @@ A:hover {
text-align: center;
white-space: pre;
}
.btnStd
{
.btnStd {
font-size: 3em;
color: #696969;
border: solid 4px #333;
@@ -335,13 +331,14 @@ li.static {
}
}
div > ul > li > a.selected.menuNav{
div > ul > li > a.selected.menuNav {
background-color: white;
color: black;
}
.areaContMenu {
background-color: white;
padding:4px;
padding: 4px;
border-color: #CDCDCD;
border-style: solid;
border-width: 1px 1px 1px 1px;
@@ -350,6 +347,27 @@ div > ul > li > a.selected.menuNav{
/* end zona menu */
/* zona placard valori */
@roundCorner: 4px;
@padStd: 4px;
.roundedCorner {
-moz-border-radius: @roundCorner;
-webkit-border-radius: @roundCorner;
border-radius: @roundCorner;
}
.padStd {
padding: @padStd;
}
.bordoGrigio {
.padStd;
.roundedCorner;
border: 2px solid #696969;
background-color:#ECECEC;
}
/* end zona placard*/
/* zona colorazione filtri */
.filtro_1 {
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/WebUserControls/mod_commesse.ascx
+1 -1
View File
@@ -59,7 +59,7 @@
<asp:Image runat="server" ID="imgSpaz" Width='<%# widthByCod(Eval("codFase")) %>' ImageUrl="~/images/EmptyImg.png" />
</div>
<div class="divSx">
<asp:TextBox ID="txtnomeFase" runat="server" Text='<%# Bind("nomeFase") %>' Width="28em" />
<asp:TextBox ID="txtnomeFase" runat="server" Text='<%# Bind("nomeFase") %>' Width="28em" Enabled='<%# !isAncestor(Eval("idxFaseAncest")) %>' />
<br />
<asp:TextBox ID="txtdescrizioneFase" runat="server" Text='<%# Bind("descrizioneFase") %>' Width="28em" TextMode="MultiLine" Height="4em" />
</div>
PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx.cs
+1
View File
@@ -271,6 +271,7 @@ namespace PROJ_ETS.WebUserControls
protected void btnNewEmpty_Click(object sender, EventArgs e)
{
utils.obj.setSessionVal("idxFaseAncest", "0");
// !!!FARE!!! gestioen insert con calcolo num commessa, ...
#if false
DataProxy.DP.taAF.insertQuery(idxProgetto, 0, "NuovaFase", "DescrizioneFase", false, false, 0, 0, true);
#endif
PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx
+7 -7
View File
@@ -8,22 +8,22 @@
</div>
</div>
<div>
<div class="divSx" style="min-width: 120px; width: 18%;">
<div class="divSx" style="min-width: 90px; width: 15%;">
<div>
<div class="divSx">
<div class="divSx padStd">
<asp:Label ID="lblAnno" runat="server" Text="Anno" AssociatedControlID="AnnoCommessa" />
<asp:Label ID="AnnoCommessa" runat="server" Text='<%# Eval("AnnoCommessa") %>' CssClass="divSx filtro_2 ui-corner-all" />
<asp:Label ID="AnnoCommessa" runat="server" Text='<%# Eval("AnnoCommessa") %>' CssClass="divSx bordoGrigio" />
</div>
<div class="divDx">
<div class="divDx padStd">
<asp:Label ID="lblNumeroCommessa" runat="server" Text="Numero" AssociatedControlID="NumeroCommessa" />
<asp:Label ID="NumeroCommessa" runat="server" Text='<%# Eval("NumeroCommessa") %>' CssClass="divDx filtro_2 ui-corner-all" />
<asp:Label ID="NumeroCommessa" runat="server" Text='<%# Eval("NumeroCommessa","{0:0000}") %>' CssClass="divDx bordoGrigio" />
</div>
</div>
</div>
<div class="divSx" style="min-width: 250px; width: 32%;">
<div class="divSx" style="min-width: 180px; width: 30%;">
due
</div>
<div class="divSx" style="min-width: 300px; width: 50%;">
<div class="divSx" style="min-width: 275px; width: 55%;">
tre
</div>
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/PROJ-ETS/logs/2013-05-24.log
+8
View File
@@ -0,0 +1,8 @@
2013-05-24 08:11:25.0961 [INFO] User login: Locatelli Samuele (STEAMWAREWIN\samuele)
2013-05-24 08:11:25.3561 [INFO] L'utente Locatelli Samuele (STEAMWAREWIN\samuele) ha effettuato il login correttamente
2013-05-24 09:10:31.3009 [INFO] User login: Locatelli Samuele (STEAMWAREWIN\samuele)
2013-05-24 09:10:31.5189 [INFO] L'utente Locatelli Samuele (STEAMWAREWIN\samuele) ha effettuato il login correttamente
2013-05-24 09:13:08.7282 [INFO] L'utente Locatelli Samuele (STEAMWAREWIN\samuele) ha effettuato il login correttamente
2013-05-24 09:14:20.8933 [INFO] L'utente Locatelli Samuele (STEAMWAREWIN\samuele) ha effettuato il login correttamente
2013-05-24 09:16:10.9352 [INFO] L'utente Locatelli Samuele (STEAMWAREWIN\samuele) ha effettuato il login correttamente
2013-05-24 09:18:16.3997 [INFO] L'utente Locatelli Samuele (STEAMWAREWIN\samuele) ha effettuato il login correttamente
PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.csprojResolveAssemblyReference.cache
BIN
View File
Binary file not shown.
PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.dll
BIN
View File
Binary file not shown.