Visualizzazione movimenti periodici

mikymaione · Nov 26, 2020 · c5985b4 · c5985b4
1 parent a48e89f
commit c5985b4
Show file tree

Hide file tree

Showing 7 changed files with 73 additions and 105 deletions.
diff --git a/RCSetup/RCSetup.vdproj b/RCSetup/RCSetup.vdproj
@@ -664,25 +664,25 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_ED0138E7D2EF4A1D8688291CFB8751C8"
+        "OwnerKey" = "8:_CA874C7F010848F5AA63BC8D9260CD2C"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_7DBAFBD9F025B2B814197046444B0E00"
+        "OwnerKey" = "8:_D29C1558AFA9F2FF42D62337F134E071"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_911DE9EECD9BED546535C7C0ABF86807"
+        "OwnerKey" = "8:_56108103035D675E35B73E6B135FA008"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_148F6D9F5822B0A171AD65462B3BC029"
+        "OwnerKey" = "8:_E46F1CBFD88405F70C9084F3F8C0B70F"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -694,25 +694,25 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_E46F1CBFD88405F70C9084F3F8C0B70F"
+        "OwnerKey" = "8:_148F6D9F5822B0A171AD65462B3BC029"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_56108103035D675E35B73E6B135FA008"
+        "OwnerKey" = "8:_911DE9EECD9BED546535C7C0ABF86807"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_D29C1558AFA9F2FF42D62337F134E071"
+        "OwnerKey" = "8:_7DBAFBD9F025B2B814197046444B0E00"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_CA874C7F010848F5AA63BC8D9260CD2C"
+        "OwnerKey" = "8:_ED0138E7D2EF4A1D8688291CFB8751C8"
         "MsmSig" = "8:_UNDEFINED"
         }
     }
@@ -922,11 +922,6 @@
             "AssemblyAsmDisplayName" = "8:Microsoft.ReportViewer.WinForms, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_148F6D9F5822B0A171AD65462B3BC029"
-                    {
-                    "Name" = "8:Microsoft.ReportViewer.WinForms.dll"
-                    "Attributes" = "3:512"
-                    }
                 }
             "SourcePath" = "8:Microsoft.ReportViewer.WinForms.dll"
             "TargetName" = "8:"
@@ -1564,11 +1559,6 @@
             "AssemblyAsmDisplayName" = "8:Microsoft.ReportViewer.DataVisualization, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_56108103035D675E35B73E6B135FA008"
-                    {
-                    "Name" = "8:Microsoft.ReportViewer.DataVisualization.dll"
-                    "Attributes" = "3:512"
-                    }
                 }
             "SourcePath" = "8:Microsoft.ReportViewer.DataVisualization.dll"
             "TargetName" = "8:"
@@ -1935,11 +1925,6 @@
             "AssemblyAsmDisplayName" = "8:Microsoft.ReportViewer.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_7A9E9DD003ADE11CB7DCB74CF22CC778"
-                    {
-                    "Name" = "8:Microsoft.ReportViewer.Common.dll"
-                    "Attributes" = "3:512"
-                    }
                 }
             "SourcePath" = "8:Microsoft.ReportViewer.Common.dll"
             "TargetName" = "8:"
@@ -1986,11 +1971,6 @@
             "AssemblyAsmDisplayName" = "8:System.Data.SQLite, Version=1.0.108.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_7DBAFBD9F025B2B814197046444B0E00"
-                    {
-                    "Name" = "8:System.Data.SQLite.dll"
-                    "Attributes" = "3:512"
-                    }
                 }
             "SourcePath" = "8:System.Data.SQLite.dll"
             "TargetName" = "8:"
@@ -2217,11 +2197,6 @@
             "AssemblyAsmDisplayName" = "8:ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_911DE9EECD9BED546535C7C0ABF86807"
-                    {
-                    "Name" = "8:ICSharpCode.SharpZipLib.dll"
-                    "Attributes" = "3:512"
-                    }
                 }
             "SourcePath" = "8:ICSharpCode.SharpZipLib.dll"
             "TargetName" = "8:"
@@ -2548,11 +2523,6 @@
             "AssemblyAsmDisplayName" = "8:ILCalc, Version=20.18.4.11, Culture=neutral, PublicKeyToken=5c31270a473b7e3c, processorArchitecture=AMD64"
                 "ScatterAssemblies"
                 {
-                    "_CA874C7F010848F5AA63BC8D9260CD2C"
-                    {
-                    "Name" = "8:ILCalc.dll"
-                    "Attributes" = "3:512"
-                    }
                 }
             "SourcePath" = "8:ILCalc.dll"
             "TargetName" = "8:"
@@ -2659,11 +2629,6 @@
             "AssemblyAsmDisplayName" = "8:FastColoredTextBox, Version=2.16.21.0, Culture=neutral, PublicKeyToken=fb8aa12b994ef61b, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_D29C1558AFA9F2FF42D62337F134E071"
-                    {
-                    "Name" = "8:FastColoredTextBox.dll"
-                    "Attributes" = "3:512"
-                    }
                 }
             "SourcePath" = "8:FastColoredTextBox.dll"
             "TargetName" = "8:"
@@ -2930,11 +2895,6 @@
             "AssemblyAsmDisplayName" = "8:Microsoft.ReportViewer.ProcessingObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_E46F1CBFD88405F70C9084F3F8C0B70F"
-                    {
-                    "Name" = "8:Microsoft.ReportViewer.ProcessingObjectModel.dll"
-                    "Attributes" = "3:512"
-                    }
                 }
             "SourcePath" = "8:Microsoft.ReportViewer.ProcessingObjectModel.dll"
             "TargetName" = "8:"
@@ -3188,15 +3148,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:RationesCurare7"
-        "ProductCode" = "8:{37EC1D4C-CFBE-4217-8543-B98C11998ED0}"
-        "PackageCode" = "8:{6EF647EE-7B96-4932-BE99-DE9BFC714E8E}"
+        "ProductCode" = "8:{8967BEF5-7F7B-4881-A22E-608A5DADFB60}"
+        "PackageCode" = "8:{D78D7C6F-6CA9-4991-A0D1-BBC4AEC7D382}"
         "UpgradeCode" = "8:{BD521D0C-80D8-4377-B6EF-68783AA9C67C}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:20.20.0928"
+        "ProductVersion" = "8:20.20.1126"
         "Manufacturer" = "8:[MAIONE MIKY]"
         "ARPHELPTELEPHONE" = "8:mikymaione@hotmail.it"
         "ARPHELPLINK" = "8:http://www.maionemiky.it"

diff --git a/RationesCurare7/DB/DBW/Periodici_Ricerca.sql b/RationesCurare7/DB/DBW/Periodici_Ricerca.sql
@@ -1,12 +1,14 @@
 SELECT 
-	m.*,
-	case 
-		when m.TipoGiorniMese = 'M' then Datepart('d', m.GiornoDelMese)
-		else null
-	end as GiornoDelMese_H,
+	m.*,	
 	case
-		when m.TipoGiorniMese = 'G' then 'giorni'
-		else 'mese'
+		when m.TipoGiorniMese = 'G' then 'Giornaliero'
+		when m.TipoGiorniMese = 'M' then 'Mensile'
+		when m.TipoGiorniMese = 'B' then 'Bimestrale'
+		when m.TipoGiorniMese = 'T' then 'Trimestrale'
+		when m.TipoGiorniMese = 'Q' then 'Quadrimestrale'
+		when m.TipoGiorniMese = 'S' then 'Semestrale'
+		when m.TipoGiorniMese = 'A' then 'Annuale'
+		else 'NaN'
 	end as Periodo_H
 FROM MovimentiTempo m
 order by

diff --git a/RationesCurare7/DB/DataWrapper/cPeriodici.cs b/RationesCurare7/DB/DataWrapper/cPeriodici.cs
@@ -214,11 +214,10 @@ public DataTable Ricerca()
                 new DataColumn("MacroArea", typeof(string)),
                 new DataColumn("Scadenza", typeof(DateTime)),
                 new DataColumn("soldi", typeof(double)),
-                new DataColumn("GiornoDelMese_H", typeof(int)),
                 new DataColumn("Periodo_H", typeof(string))
             };
 
-            return cGB.sDB.EseguiSQLDataTable((DB.cDB.Queries.Periodici_Ricerca), null, colonne);
+            return cGB.sDB.EseguiSQLDataTable((cDB.Queries.Periodici_Ricerca), null, colonne);
         }
 
         public List<cPeriodici> RicercaScadenzeEntroOggi()

diff --git a/RationesCurare7/Novita.htm b/RationesCurare7/Novita.htm
@@ -20,6 +20,9 @@
 
     <strong><span class="style1">Lista delle modifiche apportate:</span></strong>
 
+    <br /><br /><strong>20.20.11.26</strong>
+    <br />-Visualizzazione movimenti periodici
+
     <br /><br /><strong>20.20.09.28</strong>
     <br />-Bug grafico linee
     <br />-Bug albero casse

diff --git a/RationesCurare7/Properties/AssemblyInfo.cs b/RationesCurare7/Properties/AssemblyInfo.cs
@@ -39,5 +39,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("20.20.09.28")]
-[assembly: AssemblyFileVersion("20.20.09.28")]
+[assembly: AssemblyVersion("20.20.11.26")]
+[assembly: AssemblyFileVersion("20.20.11.26")]
diff --git a/RationesCurare7/UI/Controlli/cMovimentiPeriodici.Designer.cs b/RationesCurare7/UI/Controlli/cMovimentiPeriodici.Designer.cs