Finish release/v1.0.0

Finish Release/v1.0.0
openimis · Nov 27, 2019 · 780f7ce · 780f7ce
2 parents b577c2b + b39c17e
commit 780f7ce
Show file tree

Hide file tree

Showing 411 changed files with 17,211 additions and 905 deletions.
diff --git a/ImisRestApi.sln b/ImisRestApi.sln
@@ -1,17 +1,19 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27703.2026
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29102.190
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenImis.RestApi", "OpenImis.RestApi\OpenImis.RestApi.csproj", "{0F650C61-A020-4549-AC0C-C49F0334E2D7}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenImis.RestApi.IntegrationTests", "OpenImis.RestApi.IntegrationTests\OpenImis.RestApi.IntegrationTests.csproj", "{F5C3D0E3-9FE3-4C30-A8DF-E610FE205F3C}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenImis.Extensions.Configuration", "OpenImis.Extensions.Configuration\OpenImis.Extensions.Configuration.csproj", "{E2CEBBAF-6DF7-41E9-815D-9AD4CF90C844}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenImis.DB.SqlServer", "OpenImis.DB.SqlServer\OpenImis.DB.SqlServer.csproj", "{563662BC-9B77-46CA-AF68-4143A146601E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenImis.DB.SqlServer", "OpenImis.DB.SqlServer\OpenImis.DB.SqlServer.csproj", "{563662BC-9B77-46CA-AF68-4143A146601E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenImis.Modules", "OpenImis.Modules\OpenImis.Modules.csproj", "{F18EF622-6FC3-40A0-B58C-7A9F6B6018FC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenImis.ModulesV1", "OpenImis.ModulesV1\OpenImis.ModulesV1.csproj", "{F323C452-F4D9-4825-8954-30BE26A81874}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenImis.ModulesV2", "OpenImis.ModulesV2\OpenImis.ModulesV2.csproj", "{2AE88A62-30F2-4D13-8E71-6C1F8E6D5B61}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -35,10 +37,14 @@ Global
 		{563662BC-9B77-46CA-AF68-4143A146601E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{563662BC-9B77-46CA-AF68-4143A146601E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{563662BC-9B77-46CA-AF68-4143A146601E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F18EF622-6FC3-40A0-B58C-7A9F6B6018FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F18EF622-6FC3-40A0-B58C-7A9F6B6018FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F18EF622-6FC3-40A0-B58C-7A9F6B6018FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F18EF622-6FC3-40A0-B58C-7A9F6B6018FC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F323C452-F4D9-4825-8954-30BE26A81874}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F323C452-F4D9-4825-8954-30BE26A81874}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F323C452-F4D9-4825-8954-30BE26A81874}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F323C452-F4D9-4825-8954-30BE26A81874}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2AE88A62-30F2-4D13-8E71-6C1F8E6D5B61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2AE88A62-30F2-4D13-8E71-6C1F8E6D5B61}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2AE88A62-30F2-4D13-8E71-6C1F8E6D5B61}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2AE88A62-30F2-4D13-8E71-6C1F8E6D5B61}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/OpenImis.DB.SqlServer/DataHelper/DataHelper.cs b/OpenImis.DB.SqlServer/DataHelper/DataHelper.cs
@@ -0,0 +1,169 @@
+using Microsoft.Extensions.Configuration;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+
+namespace OpenImis.DB.SqlServer.DataHelper
+{
+    public class DataHelper
+    {
+        private readonly string ConnectionString;
+
+        public int ReturnValue { get; set; }
+
+        public DataHelper(IConfiguration configuration)
+        {
+            ConnectionString = configuration["ConnectionStrings:IMISDatabase"];
+        }
+
+        public DataSet FillDataSet(string SQL, SqlParameter[] parameters, CommandType commandType)
+        {
+            DataSet ds = new DataSet();
+            var sqlConnection = new SqlConnection(ConnectionString);
+
+            SqlParameter returnParameter = new SqlParameter("@RV", SqlDbType.Int);
+            returnParameter.Direction = ParameterDirection.ReturnValue;
+
+            var command = new SqlCommand(SQL, sqlConnection)
+            {
+                CommandType = commandType
+            };
+
+            command.Parameters.Add(returnParameter);
+
+            var adapter = new SqlDataAdapter(command);
+            using (command)
+            {
+                if (parameters.Length > 0)
+                    command.Parameters.AddRange(parameters);
+                adapter.Fill(ds);
+            }
+
+            ReturnValue = int.Parse(returnParameter.Value.ToString());
+
+            return ds;
+        }
+
+        public DataTable GetDataTable(string SQL, SqlParameter[] parameters, CommandType commandType)
+        {
+            DataTable dt = new DataTable();
+            var sqlConnection = new SqlConnection(ConnectionString);
+            var command = new SqlCommand(SQL, sqlConnection)
+            {
+                CommandType = commandType
+            };
+
+            var adapter = new SqlDataAdapter(command);
+
+            using (command)
+            {
+                if (parameters.Length > 0)
+                    command.Parameters.AddRange(parameters);
+                adapter.Fill(dt);
+            }
+
+            return dt;
+        }
+
+        public void Execute(string SQL, SqlParameter[] parameters, CommandType commandType)
+        {
+            var sqlConnection = new SqlConnection(ConnectionString);
+
+            //if(SqlCommand.C)
+            // sqlConnection.Open
+            var command = new SqlCommand(SQL, sqlConnection)
+            {
+                CommandType = commandType
+            };
+
+            using (command)
+            {
+                if (command.Connection.State == 0)
+                {
+                    command.Connection.Open();
+
+                    if (parameters.Length > 0)
+                        command.Parameters.AddRange(parameters);
+
+                    command.ExecuteNonQuery();
+
+                    command.Connection.Close();
+                }
+            }
+        }
+
+        public ProcedureOutPut Procedure(string StoredProcedure, SqlParameter[] parameters, int tableIndex = 0)
+        {
+            DataSet dt = new DataSet();
+
+            SqlConnection sqlConnection = new SqlConnection(ConnectionString);
+            SqlCommand command = new SqlCommand();
+            //SqlDataReader reader;
+
+            SqlParameter returnParameter = new SqlParameter("@RV", SqlDbType.Int);
+            returnParameter.Direction = ParameterDirection.ReturnValue;
+
+            command.CommandText = StoredProcedure;
+            command.CommandType = CommandType.StoredProcedure;
+            command.Connection = sqlConnection;
+            command.Parameters.Add(returnParameter);
+
+            if (parameters.Length > 0)
+                command.Parameters.AddRange(parameters);
+
+            var adapter = new SqlDataAdapter(command);
+
+            using (command)
+            {
+                adapter.Fill(dt);
+            }
+
+            int rv = int.Parse(returnParameter.Value.ToString());
+            DataTable dat = new DataTable();
+
+            if (rv == 0)
+            {
+                dat = dt.Tables[tableIndex];
+            }
+
+            var output = new ProcedureOutPut
+            {
+                Code = rv,
+                Data = dat
+            };
+
+            return output;
+        }
+
+        public IList<SqlParameter> ExecProcedure(string StoredProcedure, SqlParameter[] parameters)
+        {
+            SqlConnection sqlConnection = new SqlConnection(ConnectionString);
+            SqlCommand command = new SqlCommand();
+
+            SqlParameter returnParameter = new SqlParameter("@RV", SqlDbType.Int);
+            returnParameter.Direction = ParameterDirection.ReturnValue;
+
+            command.CommandText = StoredProcedure;
+            command.CommandType = CommandType.StoredProcedure;
+            command.Connection = sqlConnection;
+            command.Parameters.Add(returnParameter);
+
+            if (parameters.Length > 0)
+                command.Parameters.AddRange(parameters);
+
+            sqlConnection.Open();
+
+            command.ExecuteNonQuery();
+
+            var rv = parameters.Where(x => x.Direction.Equals(ParameterDirection.Output) || x.Direction.Equals(ParameterDirection.ReturnValue)).ToList();
+            rv.Add(returnParameter);
+
+            sqlConnection.Close();
+
+            return rv;
+        }
+    }
+}
diff --git a/OpenImis.DB.SqlServer/DataHelper/ProcedureOutPut.cs b/OpenImis.DB.SqlServer/DataHelper/ProcedureOutPut.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Data;
+
+namespace OpenImis.DB.SqlServer.DataHelper
+{
+    public class ProcedureOutPut
+    {
+        public int Code { get; set; }
+        public DataTable Data { get; set; }
+    }
+}
diff --git a/OpenImis.DB.SqlServer/IMISContext.cs b/OpenImis.DB.SqlServer/IMISContext.cs
@@ -71,11 +71,17 @@ public IMISContext(DbContextOptions<IMISContext> options)
         public virtual DbSet<TblSubmittedPhotos> TblSubmittedPhotos { get; set; }
         public virtual DbSet<TblUsers> TblUsers { get; set; }
         public virtual DbSet<TblUsersDistricts> TblUsersDistricts { get; set; }
+        public virtual DbSet<TblRoleRight> TblRoleRight { get; set; }
+        public virtual DbSet<TblUserRole> TblUserRole { get; set; }
+        public virtual DbSet<TblIMISDefaultsPhone> TblIMISDefaultsPhone { get; set; }
+        public virtual DbSet<TblVillages> TblVillages { get; set; }
+        public virtual DbSet<TblWards> TblWards { get; set; }
+        public virtual DbSet<TblDistricts> TblDistricts { get; set; }
 
         // Unable to generate entity type for table 'dbo.tblIMISDetaulsPhone'. Please see the warning messages.
         // Unable to generate entity type for table 'dbo.tblEmailSettings'. Please see the warning messages.
 
-        
+
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
             modelBuilder.Entity<TblBatchRun>(entity =>
@@ -2646,6 +2652,36 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                     .OnDelete(DeleteBehavior.ClientSetNull)
                     .HasConstraintName("FK_tblUsersDistricts_tblUsers");
             });
+
+            modelBuilder.Entity<TblRoleRight>(entity =>
+            {
+                entity.HasKey(e => e.RoleRightID);
+            });
+
+            modelBuilder.Entity<TblUserRole>(entity =>
+            {
+                entity.HasKey(e => e.UserRoleID);
+            });
+
+            modelBuilder.Entity<TblIMISDefaultsPhone>(entity =>
+            {
+                entity.HasKey(e => e.RuleName);
+            });
+
+            modelBuilder.Entity<TblVillages>(entity =>
+            {
+                entity.HasKey(e => e.VillageId);
+            });
+
+            modelBuilder.Entity<TblWards>(entity =>
+            {
+                entity.HasKey(e => e.WardId);
+            });
+
+            modelBuilder.Entity<TblDistricts>(entity =>
+            {
+                entity.HasKey(e => e.DistrictId);
+            });
         }
     }
-}
+}
diff --git a/OpenImis.DB.SqlServer/ImisDB.cs b/OpenImis.DB.SqlServer/ImisDB.cs
@@ -16,7 +16,7 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
 			.AddJsonFile($"appsettings.json")
 			//.AddJsonFile(Environment.GetEnvironmentVariable("REGISTRY_CONFIG_FILE"))
 			//.AddJsonFile("appsettings.json")
-			.AddJsonFile($"appsettings.{Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT")}.json", optional: true, reloadOnChange: true)
+			.AddJsonFile(Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT")!=null?$"appsettings.{Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT")}.json": "appsettings.Production.json", optional: false, reloadOnChange: true)
 			.Build();
 
 			optionsBuilder.UseSqlServer(configuration.GetConnectionString("IMISDatabase"));

diff --git a/OpenImis.DB.SqlServer/OpenImis.DB.SqlServer.csproj b/OpenImis.DB.SqlServer/OpenImis.DB.SqlServer.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/OpenImis.DB.SqlServer/TblClaim.cs b/OpenImis.DB.SqlServer/TblClaim.cs
@@ -13,6 +13,7 @@ public TblClaim()
         }
 
         public int ClaimId { get; set; }
+        public Guid ClaimUUID { get; set; }
         public int InsureeId { get; set; }
         public string ClaimCode { get; set; }
         public DateTime DateFrom { get; set; }

diff --git a/OpenImis.DB.SqlServer/TblDistricts.cs b/OpenImis.DB.SqlServer/TblDistricts.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenImis.DB.SqlServer
+{
+    public class TblDistricts
+    {
+        public int DistrictId { get; set; }
+        public string DistrictCode { get; set; }
+        public string DistrictName { get; set; }
+        public DateTime ValidityFrom { get; set; }
+        public DateTime? ValidityTo { get; set; }
+    }
+}
diff --git a/OpenImis.DB.SqlServer/TblFamilies.cs b/OpenImis.DB.SqlServer/TblFamilies.cs
@@ -12,6 +12,7 @@ public TblFamilies()
         }
 
         public int FamilyId { get; set; }
+        public Guid FamilyUUID { get; set; }
         public int InsureeId { get; set; }
         public int? LocationId { get; set; }
         public bool? Poverty { get; set; }

diff --git a/OpenImis.DB.SqlServer/TblIMISDefaultsPhone.cs b/OpenImis.DB.SqlServer/TblIMISDefaultsPhone.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenImis.DB.SqlServer
+{
+    public class TblIMISDefaultsPhone
+    {
+        public string RuleName { get; set; }
+        public bool? RuleValue { get; set; }
+    }
+}
diff --git a/OpenImis.DB.SqlServer/TblInsuree.cs b/OpenImis.DB.SqlServer/TblInsuree.cs
@@ -17,6 +17,7 @@ public TblInsuree()
         }
 
         public int InsureeId { get; set; }
+        public Guid InsureeUUID { get; set; }
         public int FamilyId { get; set; }
         public string Chfid { get; set; }
         public string LastName { get; set; }

diff --git a/OpenImis.DB.SqlServer/TblOfficer.cs b/OpenImis.DB.SqlServer/TblOfficer.cs
@@ -14,6 +14,7 @@ public TblOfficer()
         }
 
         public int OfficerId { get; set; }
+        public Guid OfficerUUID { get; set; }
         public string Code { get; set; }
         public string LastName { get; set; }
         public string OtherNames { get; set; }

diff --git a/OpenImis.DB.SqlServer/TblPolicyRenewals.cs b/OpenImis.DB.SqlServer/TblPolicyRenewals.cs
@@ -11,6 +11,7 @@ public TblPolicyRenewals()
         }
 
         public int RenewalId { get; set; }
+        public Guid RenewalUUID { get; set; }
         public DateTime RenewalPromptDate { get; set; }
         public DateTime RenewalDate { get; set; }
         public int? NewOfficerId { get; set; }

diff --git a/OpenImis.DB.SqlServer/TblPremium.cs b/OpenImis.DB.SqlServer/TblPremium.cs
@@ -20,6 +20,8 @@ public partial class TblPremium
         public bool? IsPhotoFee { get; set; }
         public bool? IsOffline { get; set; }
         public int? ReportingId { get; set; }
+        public int? ReportingCommissionID { get; set; }
+        public int? ReportingCommisionID { get; set; }
 
         public TblPayer Payer { get; set; }
         public TblPolicy Policy { get; set; }

diff --git a/OpenImis.DB.SqlServer/TblReporting.cs b/OpenImis.DB.SqlServer/TblReporting.cs
@@ -13,5 +13,9 @@ public partial class TblReporting
         public DateTime StartDate { get; set; }
         public DateTime EndDate { get; set; }
         public int RecordFound { get; set; }
+        public int? OfficerID { get; set; }
+        public int? ReportType { get; set; }
+        public decimal? CammissionRate { get; set; }
+        public decimal? CommissionRate { get; set; }
     }
 }