diff --git a/.gitignore b/.gitignore index e29e11e..04d13c6 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,4 @@ VersGen\obj\* # WebSC #-------------------------------------------- WebSCR\obj\* - +WebSCR/logs/*.txt \ No newline at end of file diff --git a/VersGen/bin/Debug/VersGen.dll b/VersGen/bin/Debug/VersGen.dll index a3a4128..486508c 100644 Binary files a/VersGen/bin/Debug/VersGen.dll and b/VersGen/bin/Debug/VersGen.dll differ diff --git a/VersGen/obj/Debug/VersGen.dll b/VersGen/obj/Debug/VersGen.dll index a3a4128..486508c 100644 Binary files a/VersGen/obj/Debug/VersGen.dll and b/VersGen/obj/Debug/VersGen.dll differ diff --git a/WebSCR.v11.suo b/WebSCR.v11.suo index 9a04c17..f2afab5 100644 Binary files a/WebSCR.v11.suo and b/WebSCR.v11.suo differ diff --git a/WebSCR/Content/WebSCR.css b/WebSCR/Content/WebSCR.css index 7d9da09..f81eee2 100644 --- a/WebSCR/Content/WebSCR.css +++ b/WebSCR/Content/WebSCR.css @@ -18,3 +18,151 @@ border: 1px solid #707070; color: #333333; } +/* calendar white */ +.calendar_white_main { + border: 1px solid #999; +} +.calendar_white_scroll_up { + background: url(calendar_white/up.png); +} +.calendar_white_scroll_down { + background: url(calendar_white/down.png); +} +.calendar_white_rowheader_inner, +.calendar_white_cornerright_inner, +.calendar_white_corner_inner, +.calendar_white_colheader_inner, +.calendar_white_alldayheader_inner { + color: #666; + background: #eee; + background: -moz-linear-gradient(top, #eeeeee 0%, #dddddd); + background: -webkit-gradient(linear, left top, left bottom, from(#eeeeee), to(#dddddd)); + filter: progid:DXImageTransform.Microsoft.Gradient(startColorStr="#eeeeee", endColorStr="#dddddd"); +} +.calendar_white_cornerright_inner { + position: absolute; + top: 0px; + left: 0px; + bottom: 0px; + right: 0px; + border-bottom: 1px solid #999; +} +.calendar_white_rowheader_inner { + font-size: 16pt; + text-align: right; + position: absolute; + top: 0px; + left: 0px; + bottom: 0px; + right: 0px; + border-right: 1px solid #999; + border-bottom: 1px solid #999; +} +.calendar_white_corner_inner { + position: absolute; + top: 0px; + left: 0px; + bottom: 0px; + right: 0px; + border-right: 1px solid #999; + border-bottom: 1px solid #999; +} +.calendar_white_rowheader_minutes { + font-size: 10px; + vertical-align: super; + padding-left: 2px; + padding-right: 2px; +} +.calendar_white_colheader_inner { + text-align: center; + position: absolute; + top: 0px; + left: 0px; + bottom: 0px; + right: 0px; + border-right: 1px solid #999; + border-bottom: 1px solid #999; +} +.calendar_white_cell_inner { + position: absolute; + top: 0px; + left: 0px; + bottom: 0px; + right: 0px; + border-right: 1px solid #ddd; + border-bottom: 1px solid #ddd; + background-color: #ffffff; +} +.calendar_white_alldayheader_inner { + text-align: center; + position: absolute; + top: 0px; + left: 0px; + bottom: 0px; + right: 0px; + border-right: 1px solid #999; + border-bottom: 1px solid #999; +} +.calendar_white_message { + opacity: 0.9; + filter: alpha(opacity=90); + padding: 10px; + color: #ffffff; + background: #ffa216; + background: -moz-linear-gradient(top, #ffa216 0%, #ff8400); + background: -webkit-gradient(linear, left top, left bottom, from(#ffa216), to(#ff8400)); + filter: progid:DXImageTransform.Microsoft.Gradient(startColorStr="#ffa216", endColorStr="#ff8400"); +} +.calendar_white_alldayevent_inner, +.calendar_white_event_inner { + color: #666; + background: #fff; + background: -moz-linear-gradient(top, #ffffff 0%, #eeeeee); + background: -webkit-gradient(linear, left top, left bottom, from(#ffffff), to(#eeeeee)); + filter: progid:DXImageTransform.Microsoft.Gradient(startColorStr="#ffffff", endColorStr="#eeeeee"); + border: 1px solid #999; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; + -moz-box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.3), inset 0px 0px 2px rgba(255, 255, 255, 0.8); + -webkit-box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.3), inset 0px 0px 2px rgba(255, 255, 255, 0.8); + box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.3), inset 0px 0px 2px rgba(255, 255, 255, 0.8); +} +.calendar_white_selected .calendar_white_event_inner { + background: #ddd; +} +.calendar_white_alldayevent_inner { + position: absolute; + top: 2px; + bottom: 2px; + left: 2px; + right: 1px; + padding: 2px; + margin-right: 1px; + font-size: 12px; +} +.calendar_white_event_withheader .calendar_white_event_inner { + padding-top: 15px; +} +.calendar_white_event { + cursor: default; +} +.calendar_white_event_inner { + position: absolute; + overflow: hidden; + top: 0px; + bottom: 2px; + left: 2px; + right: 0px; + padding: 2px; + font-size: 12px; +} +.calendar_white_shadow_inner { + background-color: #666666; + opacity: 0.5; + filter: alpha(opacity=50); + height: 100%; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; +} diff --git a/WebSCR/Content/WebSCR.less b/WebSCR/Content/WebSCR.less index 5181c94..cada01f 100644 --- a/WebSCR/Content/WebSCR.less +++ b/WebSCR/Content/WebSCR.less @@ -43,4 +43,225 @@ background-color: @grigioChiaro; border: 1px solid @grigioScuro; color: @testoScuro; +} + +/* calendar white */ + +.calendar_white_main +{ + border: 1px solid #999; +} + +.calendar_white_colheader +{ +} + +.calendar_white_scroll_up { + background: url(calendar_white/up.png); +} + +.calendar_white_scroll_down { + background: url(calendar_white/down.png); +} + +.calendar_white_rowheader_inner, +.calendar_white_cornerright_inner, +.calendar_white_corner_inner, +.calendar_white_colheader_inner, +.calendar_white_alldayheader_inner +{ + color: #666; + background: #eee; + background: -moz-linear-gradient( + top, + #eee 0%, + #ddd); + background: -webkit-gradient( + linear, left top, left bottom, + from(#eee), + to(#ddd)); + filter: progid:DXImageTransform.Microsoft.Gradient(startColorStr="#eeeeee", endColorStr="#dddddd"); + +} + +.calendar_white_cornerright_inner +{ + position: absolute; + top: 0px; + left: 0px; + bottom: 0px; + right: 0px; + border-bottom: 1px solid #999; +} + +.calendar_white_rowheader_inner +{ + font-size: 16pt; + text-align: right; + position: absolute; + top: 0px; + left: 0px; + bottom: 0px; + right: 0px; + border-right: 1px solid #999; + border-bottom: 1px solid #999; + +} + +.calendar_white_corner_inner +{ + position: absolute; + top: 0px; + left: 0px; + bottom: 0px; + right: 0px; + border-right: 1px solid #999; + border-bottom: 1px solid #999; +} + +.calendar_white_rowheader_minutes +{ + font-size:10px; + vertical-align: super; + padding-left: 2px; + padding-right: 2px; +} + +.calendar_white_colheader_inner +{ + text-align: center; + position: absolute; + top: 0px; + left: 0px; + bottom: 0px; + right: 0px; + border-right: 1px solid #999; + border-bottom: 1px solid #999; + +} + +.calendar_white_cell_inner +{ + position: absolute; + top: 0px; + left: 0px; + bottom: 0px; + right: 0px; + border-right: 1px solid #ddd; + border-bottom: 1px solid #ddd; + background-color: #ffffff; +} + +.calendar_white_alldayheader_inner +{ + text-align: center; + position: absolute; + top: 0px; + left: 0px; + bottom: 0px; + right: 0px; + border-right: 1px solid #999; + border-bottom: 1px solid #999; + +} + +.calendar_white_message +{ + opacity: 0.9; + filter: alpha(opacity=90); + + padding: 10px; + color: #ffffff; + background: #ffa216; + background: -moz-linear-gradient( + top, + #ffa216 0%, + #ff8400); + background: -webkit-gradient( + linear, left top, left bottom, + from(#ffa216), + to(#ff8400)); + filter: progid:DXImageTransform.Microsoft.Gradient(startColorStr="#ffa216", endColorStr="#ff8400"); +} + +.calendar_white_alldayevent_inner, +.calendar_white_event_inner +{ + color: #666; + background: #fff; + background: -moz-linear-gradient( + top, + #ffffff 0%, + #eee); + background: -webkit-gradient( + linear, left top, left bottom, + from(#ffffff), + to(#eee)); + filter: progid:DXImageTransform.Microsoft.Gradient(startColorStr="#ffffff", endColorStr="#eeeeee"); + border: 1px solid #999; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; + -moz-box-shadow: + 0px 2px 3px rgba(000,000,000,0.3), + inset 0px 0px 2px rgba(255,255,255,0.8); + -webkit-box-shadow: + 0px 2px 3px rgba(000,000,000,0.3), + inset 0px 0px 2px rgba(255,255,255,0.8); + box-shadow: + 0px 2px 3px rgba(000,000,000,0.3), + inset 0px 0px 2px rgba(255,255,255,0.8); +} + +.calendar_white_selected .calendar_white_event_inner +{ + background: #ddd; +} + +.calendar_white_alldayevent_inner +{ + position: absolute; + top: 2px; + bottom: 2px; + left: 2px; + right: 1px; + padding: 2px; + margin-right: 1px; + + font-size: 12px; +} + +.calendar_white_event_withheader .calendar_white_event_inner +{ + padding-top: 15px; +} + +.calendar_white_event +{ + cursor: default; +} + +.calendar_white_event_inner +{ + position: absolute; + overflow: hidden; + top: 0px; + bottom: 2px; + left: 2px; + right: 0px; + + padding: 2px; + + font-size: 12px; +} + +.calendar_white_shadow_inner +{ + background-color: #666666; + opacity: 0.5; + filter: alpha(opacity=50); + height: 100%; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; } \ No newline at end of file diff --git a/WebSCR/Content/WebSCR.min.css b/WebSCR/Content/WebSCR.min.css index aff2b46..45dd5d5 100644 --- a/WebSCR/Content/WebSCR.min.css +++ b/WebSCR/Content/WebSCR.min.css @@ -1 +1 @@ -.greenBox{background-color:#c3ffc3;border:1px solid #00a400;color:#333}.orangeBox{background-color:#ffa05b;border:1px solid #be5100;color:#333}.redBox{background-color:#ff9c9c;border:1px solid #cb0000;color:#333}.grayBox{background-color:#d6d6d6;border:1px solid #707070;color:#333} \ No newline at end of file +.greenBox{background-color:#c3ffc3;border:1px solid #00a400;color:#333}.orangeBox{background-color:#ffa05b;border:1px solid #be5100;color:#333}.redBox{background-color:#ff9c9c;border:1px solid #cb0000;color:#333}.grayBox{background-color:#d6d6d6;border:1px solid #707070;color:#333}.calendar_white_main{border:1px solid #999}.calendar_white_scroll_up{background:url(calendar_white/up.png)}.calendar_white_scroll_down{background:url(calendar_white/down.png)}.calendar_white_rowheader_inner,.calendar_white_cornerright_inner,.calendar_white_corner_inner,.calendar_white_colheader_inner,.calendar_white_alldayheader_inner{color:#666;background:#eee;background:-moz-linear-gradient(top,#eee 0%,#ddd);background:-webkit-gradient(linear,left top,left bottom,from(#eee),to(#ddd));filter:progid:DXImageTransform.Microsoft.Gradient(startColorStr="#eeeeee",endColorStr="#dddddd")}.calendar_white_cornerright_inner{position:absolute;top:0;left:0;bottom:0;right:0;border-bottom:1px solid #999}.calendar_white_rowheader_inner{font-size:16pt;text-align:right;position:absolute;top:0;left:0;bottom:0;right:0;border-right:1px solid #999;border-bottom:1px solid #999}.calendar_white_corner_inner{position:absolute;top:0;left:0;bottom:0;right:0;border-right:1px solid #999;border-bottom:1px solid #999}.calendar_white_rowheader_minutes{font-size:10px;vertical-align:super;padding-left:2px;padding-right:2px}.calendar_white_colheader_inner{text-align:center;position:absolute;top:0;left:0;bottom:0;right:0;border-right:1px solid #999;border-bottom:1px solid #999}.calendar_white_cell_inner{position:absolute;top:0;left:0;bottom:0;right:0;border-right:1px solid #ddd;border-bottom:1px solid #ddd;background-color:#fff}.calendar_white_alldayheader_inner{text-align:center;position:absolute;top:0;left:0;bottom:0;right:0;border-right:1px solid #999;border-bottom:1px solid #999}.calendar_white_message{opacity:.9;filter:alpha(opacity=90);padding:10px;color:#fff;background:#ffa216;background:-moz-linear-gradient(top,#ffa216 0%,#ff8400);background:-webkit-gradient(linear,left top,left bottom,from(#ffa216),to(#ff8400));filter:progid:DXImageTransform.Microsoft.Gradient(startColorStr="#ffa216",endColorStr="#ff8400")}.calendar_white_alldayevent_inner,.calendar_white_event_inner{color:#666;background:#fff;background:-moz-linear-gradient(top,#fff 0%,#eee);background:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#eee));filter:progid:DXImageTransform.Microsoft.Gradient(startColorStr="#ffffff",endColorStr="#eeeeee");border:1px solid #999;-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;-moz-box-shadow:0 2px 3px rgba(0,0,0,.3),inset 0 0 2px rgba(255,255,255,.8);-webkit-box-shadow:0 2px 3px rgba(0,0,0,.3),inset 0 0 2px rgba(255,255,255,.8);box-shadow:0 2px 3px rgba(0,0,0,.3),inset 0 0 2px rgba(255,255,255,.8)}.calendar_white_selected .calendar_white_event_inner{background:#ddd}.calendar_white_alldayevent_inner{position:absolute;top:2px;bottom:2px;left:2px;right:1px;padding:2px;margin-right:1px;font-size:12px}.calendar_white_event_withheader .calendar_white_event_inner{padding-top:15px}.calendar_white_event{cursor:default}.calendar_white_event_inner{position:absolute;overflow:hidden;top:0;bottom:2px;left:2px;right:0;padding:2px;font-size:12px}.calendar_white_shadow_inner{background-color:#666;opacity:.5;filter:alpha(opacity=50);height:100%;-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px} \ No newline at end of file diff --git a/WebSCR/Web.config b/WebSCR/Web.config index 0cbd4bd..6db464c 100644 --- a/WebSCR/Web.config +++ b/WebSCR/Web.config @@ -1,51 +1,51 @@ - + -
-
-
-
+
+
+
+
- - + + - - - + + + - - - - + + + + - - - - - + + + + + - - - - - - + + + + + + - - - + + + - + - + + + + + - + - + - + - - - + + + - + - - - + + + @@ -106,12 +110,12 @@ See http://code.google.com/p/elmah/wiki/SecuringErrorLogPages for more information on remote access and securing ELMAH. --> - + - + - + - - - - - - - + + + + + + + + + - + + + + + 745 + 676 + + + 745 + 725 + + + 784 + 725 + + + + \ No newline at end of file diff --git a/WebSCR_data/DtProxy.cs b/WebSCR_data/DtProxy.cs index e4dad91..12ecc02 100644 --- a/WebSCR_data/DtProxy.cs +++ b/WebSCR_data/DtProxy.cs @@ -33,6 +33,7 @@ namespace WebSCR_data taAC = new DS_ApplicazioneTableAdapters.AnagClientiTableAdapter(); taAS = new DS_ApplicazioneTableAdapters.AnagSquadreTableAdapter(); taAZ = new DS_ApplicazioneTableAdapters.AnagZoneTableAdapter(); + taImp = new DS_ApplicazioneTableAdapters.ImpegniTableAdapter(); taFile = new DS_UtilityTableAdapters.tblFilesTableAdapter(); } /// @@ -54,6 +55,7 @@ namespace WebSCR_data taAC.Connection.ConnectionString = connStr; taAS.Connection.ConnectionString = connStr; taAZ.Connection.ConnectionString = connStr; + taImp.Connection.ConnectionString = connStr; taFile.Connection.ConnectionString = connStrFiles; } @@ -73,6 +75,7 @@ namespace WebSCR_data public DS_ApplicazioneTableAdapters.AnagClientiTableAdapter taAC; public DS_ApplicazioneTableAdapters.AnagSquadreTableAdapter taAS; public DS_ApplicazioneTableAdapters.AnagZoneTableAdapter taAZ; + public DS_ApplicazioneTableAdapters.ImpegniTableAdapter taImp; public DS_UtilityTableAdapters.tblFilesTableAdapter taFile; public static DtProxy man = new DtProxy(); diff --git a/WebSCR_data/bin/Debug/SteamWare.dll b/WebSCR_data/bin/Debug/SteamWare.dll index 26cc3a2..748feef 100644 Binary files a/WebSCR_data/bin/Debug/SteamWare.dll and b/WebSCR_data/bin/Debug/SteamWare.dll differ diff --git a/WebSCR_data/bin/Debug/WebSCR_data.dll b/WebSCR_data/bin/Debug/WebSCR_data.dll index 5843316..3eaecfa 100644 Binary files a/WebSCR_data/bin/Debug/WebSCR_data.dll and b/WebSCR_data/bin/Debug/WebSCR_data.dll differ diff --git a/WebSCR_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll b/WebSCR_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll index b49c6ba..40fbff5 100644 Binary files a/WebSCR_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll and b/WebSCR_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll differ diff --git a/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache b/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache index 7908c0c..49b5d19 100644 Binary files a/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache and b/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache differ diff --git a/WebSCR_data/obj/Debug/WebSCR_data.dll b/WebSCR_data/obj/Debug/WebSCR_data.dll index 5843316..3eaecfa 100644 Binary files a/WebSCR_data/obj/Debug/WebSCR_data.dll and b/WebSCR_data/obj/Debug/WebSCR_data.dll differ diff --git a/packages/DayPilot.5.0.302/DayPilot.5.0.302.nupkg b/packages/DayPilot.5.0.302/DayPilot.5.0.302.nupkg new file mode 100644 index 0000000..7a9be46 Binary files /dev/null and b/packages/DayPilot.5.0.302/DayPilot.5.0.302.nupkg differ diff --git a/packages/DayPilot.5.0.302/lib/DayPilot.dll b/packages/DayPilot.5.0.302/lib/DayPilot.dll new file mode 100644 index 0000000..4dada23 Binary files /dev/null and b/packages/DayPilot.5.0.302/lib/DayPilot.dll differ