Refactoring and routine development.

mk-khan · Apr 3, 2017 · 7dbf4b6 · 7dbf4b6
1 parent 185ee74
commit 7dbf4b6
Show file tree

Hide file tree

Showing 56 changed files with 385 additions and 472 deletions.
diff --git a/docs/developer/db-docs/schemas/core.md b/docs/developer/db-docs/schemas/core.md
@@ -8,7 +8,6 @@
 | 2 | [apps](../tables/core/apps.md) | frapid_db_user | DEFAULT |  |
 | 3 | [countries](../tables/core/countries.md) | frapid_db_user | DEFAULT |  |
 | 4 | [currencies](../tables/core/currencies.md) | frapid_db_user | DEFAULT |  |
-| 5 | [frequencies](../tables/core/frequencies.md) | frapid_db_user | DEFAULT |  |
 | 6 | [genders](../tables/core/genders.md) | frapid_db_user | DEFAULT |  |
 | 7 | [marital_statuses](../tables/core/marital_statuses.md) | frapid_db_user | DEFAULT |  |
 | 8 | [menus](../tables/core/menus.md) | frapid_db_user | DEFAULT |  |

diff --git a/docs/developer/db-docs/sequences.md b/docs/developer/db-docs/sequences.md
@@ -56,7 +56,6 @@
 | 52 | core.app_dependencies_app_dependency_id_seq | frapid_db_user | bigint | 1 | 1 |  |
 | 53 | core.apps_app_id_seq | frapid_db_user | bigint | 1 | 1 |  |
 | 54 | core.currencies_currency_id_seq | frapid_db_user | bigint | 1 | 1 |  |
-| 55 | core.frequencies_frequency_id_seq | frapid_db_user | bigint | 1 | 1 |  |
 | 56 | core.marital_statuses_marital_status_id_seq | frapid_db_user | bigint | 1 | 1 |  |
 | 57 | core.menus_menu_id_seq | frapid_db_user | bigint | 1 | 1 |  |
 | 58 | core.offices_office_id_seq | frapid_db_user | bigint | 1 | 1 |  |

diff --git a/docs/developer/db-docs/tables.md b/docs/developer/db-docs/tables.md
@@ -76,7 +76,6 @@
 | 72 | [core](schemas/core.md) | [apps](tables/core/apps.md) | frapid_db_user | DEFAULT |  |
 | 73 | [core](schemas/core.md) | [countries](tables/core/countries.md) | frapid_db_user | DEFAULT |  |
 | 74 | [core](schemas/core.md) | [currencies](tables/core/currencies.md) | frapid_db_user | DEFAULT |  |
-| 75 | [core](schemas/core.md) | [frequencies](tables/core/frequencies.md) | frapid_db_user | DEFAULT |  |
 | 76 | [core](schemas/core.md) | [genders](tables/core/genders.md) | frapid_db_user | DEFAULT |  |
 | 77 | [core](schemas/core.md) | [marital_statuses](tables/core/marital_statuses.md) | frapid_db_user | DEFAULT |  |
 | 78 | [core](schemas/core.md) | [menus](tables/core/menus.md) | frapid_db_user | DEFAULT |  |

diff --git a/docs/developer/db-docs/tables/core/frequencies.md b/docs/developer/db-docs/tables/core/frequencies.md
diff --git a/docs/developer/db-docs/tables/finance/frequencies.md b/docs/developer/db-docs/tables/finance/frequencies.md
@@ -50,11 +50,8 @@
 | # | Column Name | Default |
 | --- | --- | --- |
 | 1 | frequency_id | nextval('finance.frequencies_frequency_id_seq'::regclass) |
-| 1 | frequency_id | nextval('core.frequencies_frequency_id_seq'::regclass) |
-| 5 | audit_ts | now() |
-| 5 | audit_ts | now() |
-| 6 | deleted | false |
-| 6 | deleted | false |
+| 2 | audit_ts | now() |
+| 3 | deleted | false |
 
 
 **Triggers**

diff --git a/src/Frapid.Web/Areas/.gitignore b/src/Frapid.Web/Areas/.gitignore
@@ -1,2 +1,7 @@
 /Ticketing
 /TheSmsCentral
+
+MixCBS.Banking
+MixCBS.Deposits
+MixCBS.Lendings
+MixCBS.Shares
diff --git a/src/Frapid.Web/Areas/Frapid.Account/DAL/ConfigurationProfiles.cs b/src/Frapid.Web/Areas/Frapid.Account/DAL/ConfigurationProfiles.cs
@@ -16,6 +16,7 @@ public static async Task<ConfigurationProfile> GetActiveProfileAsync(string tena
             {
                 var sql = new Sql("SELECT * FROM account.configuration_profiles");
                 sql.Where("is_active=@0", true);
+                sql.And("deleted=@0",false);
 
                 var awaiter = await db.SelectAsync<ConfigurationProfile>(sql).ConfigureAwait(false);
                 return awaiter.FirstOrDefault();

diff --git a/src/Frapid.Web/Areas/Frapid.Account/DAL/Offices.cs b/src/Frapid.Web/Areas/Frapid.Account/DAL/Offices.cs
@@ -9,8 +9,8 @@ public static class Offices
     {
         public static async Task<IEnumerable<Office>> GetOfficesAsync(string tenant)
         {
-            const string sql = "SELECT office_id, office_name FROM core.offices;";
-            return await Factory.GetAsync<Office>(tenant, sql).ConfigureAwait(false);
+            const string sql = "SELECT office_id, office_name FROM core.offices WHERE core.offices.deleted = @0;";
+            return await Factory.GetAsync<Office>(tenant, sql, false).ConfigureAwait(false);
         }
     }
 }
diff --git a/src/Frapid.Web/Areas/Frapid.Account/DAL/Registrations.cs b/src/Frapid.Web/Areas/Frapid.Account/DAL/Registrations.cs
@@ -39,8 +39,8 @@ public static async Task<bool> ConfirmRegistrationAsync(string tenant, Guid toke
 
         public static async Task<Registration> GetAsync(string tenant, Guid token)
         {
-            const string sql = "SELECT * FROM account.registrations WHERE registration_id=@0;";
-            return (await Factory.GetAsync<Registration>(tenant, sql, token).ConfigureAwait(false)).FirstOrDefault();
+            const string sql = "SELECT * FROM account.registrations WHERE registration_id=@0 AND deleted=@1;";
+            return (await Factory.GetAsync<Registration>(tenant, sql, token, false).ConfigureAwait(false)).FirstOrDefault();
         }
     }
 }
diff --git a/src/Frapid.Web/Areas/Frapid.Account/DAL/ResetRequests.cs b/src/Frapid.Web/Areas/Frapid.Account/DAL/ResetRequests.cs
@@ -12,8 +12,8 @@ public static class ResetRequests
     {
         public static async Task<Reset> GetIfActiveAsync(string tenant, string token)
         {
-            const string sql = "SELECT * FROM account.reset_requests WHERE request_id=@0 AND expires_on >= @1 AND confirmed=@2;";
-            return (await Factory.GetAsync<Reset>(tenant, sql, token, DateTimeOffset.UtcNow, false).ConfigureAwait(false)).FirstOrDefault();
+            const string sql = "SELECT * FROM account.reset_requests WHERE request_id=@0 AND expires_on >= @1 AND confirmed=@2 AND deleted=@3;";
+            return (await Factory.GetAsync<Reset>(tenant, sql, token, DateTimeOffset.UtcNow, false, false).ConfigureAwait(false)).FirstOrDefault();
         }
 
         public static async Task CompleteResetAsync(string tenant, string requestId, string password)

diff --git a/src/Frapid.Web/Areas/Frapid.Account/DAL/Users.cs b/src/Frapid.Web/Areas/Frapid.Account/DAL/Users.cs
@@ -21,6 +21,8 @@ public static async Task<User> GetAsync(string tenant, string email)
             {
                 var sql = new Sql("SELECT * FROM account.users");
                 sql.Where("email=@0", email);
+                sql.And("deleted=@0",false);
+
                 sql.Limit(db.DatabaseType, 1, 0, "user_id");
 
                 var awaiter = await db.SelectAsync<User>(sql).ConfigureAwait(false);

diff --git a/src/Frapid.Web/Areas/Frapid.Account/I18N.cs b/src/Frapid.Web/Areas/Frapid.Account/I18N.cs
@@ -164,14 +164,14 @@ static I18N()
 		public static string LastBrowser => I18NResource.GetString(ResourceDirectory, "LastBrowser");
 
 		/// <summary>
-		///Facebook Scope
+		///Fb User Id
 		/// </summary>
-		public static string FacebookScope => I18NResource.GetString(ResourceDirectory, "FacebookScope");
+		public static string FbUserId => I18NResource.GetString(ResourceDirectory, "FbUserId");
 
 		/// <summary>
-		///Fb User Id
+		///Facebook Scope
 		/// </summary>
-		public static string FbUserId => I18NResource.GetString(ResourceDirectory, "FbUserId");
+		public static string FacebookScope => I18NResource.GetString(ResourceDirectory, "FacebookScope");
 
 		/// <summary>
 		///Version Number

diff --git a/src/Frapid.Web/Areas/Frapid.Account/Overrides/Frapid.Account/Views/SignIn/Index.cshtml b/src/Frapid.Web/Areas/Frapid.Account/Overrides/Frapid.Account/Views/SignIn/Index.cshtml
@@ -7,29 +7,28 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <meta name="description" content="Frapid Framework" />
-    <link href="https://fonts.googleapis.com/css?family=Titillium+Web" rel="stylesheet" type="text/css" />
+    <meta name="description" content="Frapid Framework"/>
+    <!-- <link href="https://fonts.googleapis.com/css?family=Titillium+Web" rel="stylesheet" type="text/css"/> -->
     <title>
         @Resources.SignIn
     </title>
     @if (CultureManager.IsRtl())
     {
-
-        <link rel="Stylesheet" href="@Href("~/assets/css/backend.rtl.css")" />
+        <link rel="Stylesheet" href="@Href("~/assets/css/backend.rtl.css")"/>
     }
     else
     {
-
-        <link rel="Stylesheet" href="@Href("~/assets/css/backend.css")" />
+        <link rel="Stylesheet" href="@Href("~/assets/css/backend.css")"/>
     }
 
-    @if(!string.IsNullOrWhiteSpace(Model.GoogleSigninClientId)){
-    <!-- Google Sign In -->
-    <meta name="google-signin-scope" content="@Model.GoogleSignInScope">
-    <meta name="google-signin-client_id" content="@Model.GoogleSigninClientId">
-    <script src="https://apis.google.com/js/platform.js" async defer></script>   
+    @if (!string.IsNullOrWhiteSpace(Model.GoogleSigninClientId))
+    {
+        <!-- Google Sign In -->
+        <meta name="google-signin-scope" content="@Model.GoogleSignInScope">
+        <meta name="google-signin-client_id" content="@Model.GoogleSigninClientId">
+        <script src="https://apis.google.com/js/platform.js" async defer></script>
     }
-    
+
     <script src="/i18n/[email protected]().Name"></script>
     <script src="/assets/js/backend.js"></script>
     <script src="/scripts/jssha1.5/src/sha.js"></script>
@@ -41,84 +40,88 @@
         <div class="ui big error large dividing header vpad8"></div>
         <div class="ui toggle checkbox vpad8">
             <input id="SocialLoginCheckbox" type="checkbox">
-            <label for="SocialLoginCheckbox">Social Login</label>
+            <label for="SocialLoginCheckbox">@I18N.SocialLogin</label>
         </div>
-        <div class="ui stackable login form" id="LoginForm">
+        <form class="ui stackable login form" id="LoginForm">
             <div class="field">
-                <label for="EmailInputEmail">Email Address</label>
+                <label for="EmailInputEmail">@I18N.EmailAddress</label>
                 <div class="ui left icon input">
                     <i class="user icon"></i>
-                    <input id="EmailInputEmail" placeholder="Email"
+                    <input id="EmailInputEmail" placeholder="@I18N.Email"
                            autocapitalize="off" autocorrect="off" type="email" required=""/>
                 </div>
             </div>
             <div class="field">
-                <label for="PasswordInputPassword">Password</label>
+                <label for="PasswordInputPassword">@I18N.Password</label>
                 <div class="ui left icon input">
                     <i class="lock icon"></i>
-                    <input id="PasswordInputPassword" placeholder="Password" type="password" required=""/>
+                    <input id="PasswordInputPassword" placeholder="@I18N.Password" type="password" required=""/>
                 </div>
             </div>
             <div class="field">
-                <label for="OfficeIdSelect">Select Office</label>
-                <select class="ui search office dropdown" id="OfficeIdSelect" required=""></select>
+                <label for="OfficeIdSelect">@I18N.SelectOffice</label>
+                <select class="office select" id="OfficeIdSelect" required=""></select>
             </div>
             <div class="field">
                 <label for="CultureSelect">Select Language</label>
-                <select class="ui search language dropdown" id="CultureSelect" required=""></select>
+                <select class="language select" id="CultureSelect" required=""></select>
             </div>
             <div class="field">
                 <input type="hidden" id="ChallengeInputHidden"
                        value="@Model.Challenge"/>
             </div>
             <div class="ui buttons">
-                <button id="SignInButton" title="CRTL + RETURN" class="ui grey button" type="button">
-                    Sign In
+                <button id="SignInButton" title="CRTL + RETURN" class="ui grey button" type="submit">
+                    @I18N.SignIn
                 </button>
-                <a class="ui button" href="/">Cancel</a>
+                <a class="ui button" href="/">@I18N.Cancel</a>
             </div>
             <div class="exception field"></div>
-        </div>
+        </form>
         <div id="SocialLoginForm" class="ui login form" style="display: none;">
             <div class="field">
-                <label for="SocialOfficeSelect">Select Office</label>
-                <select class="ui search office dropdown" id="SocialOfficeSelect"></select>
+                <label for="SocialOfficeSelect">@I18N.SelectOffice</label>
+                <select class="office select" id="SocialOfficeSelect"></select>
             </div>
             <div class="field">
-                <label for="SocialLanguageSelect">Select Language</label>
-                <select class="ui search language dropdown" id="SocialLanguageSelect"></select>
+                <label for="SocialLanguageSelect">@I18N.SelectLanguage</label>
+                <select class="language select" id="SocialLanguageSelect"></select>
             </div>
             <div class="g-signin2" data-onsuccess="onSignIn" data-theme="dark"
-                 data-width="134px" data-height="32"></div>
+                 data-width="134px" data-height="32">
+            </div>
             <div class="tpad8"></div>
             <div class="ui facebook fluid button" id="FacebookButton" style="width: 134px;">
-                <i class="facebook icon"></i>Facebook
+                <i class="facebook icon"></i>@I18N.Facebook
 
             </div>
         </div>
         <div class="ui breadcrumb vpad8">
-            <a class="section" href="/account/sign-up">Create an Account</a>
+            <a class="section" href="/account/sign-up">@I18N.CreateAnAccount</a>
             <div class="divider"> / </div>
-            <a class="section" href="/account/reset">Reset My Password</a>
+            <a class="section" href="/account/reset">@I18N.ResetMyPassword</a>
         </div>
     </div>
 </div>
-    @Html.GetAntiForgeryToken(this.Request.Url)
-    <script>
-        var fbAppId = '@Model.FacebookAppId';
-        var fbScope = '@Model.FacebookScope';
-    </script>
-    <div id="fb-root"></div>
-    <script src="/Areas/Frapid.Account/scripts/account/sign-in/default.js"></script>
+@Html.GetAntiForgeryToken(Request.Url)
+<script>
+    var fbAppId = '@Model.FacebookAppId';
+    var fbScope = '@Model.FacebookScope';
+    localStorage.removeItem("haveWeMet");
+</script>
+<div id="fb-root"></div>
+<script src="/Areas/Frapid.Account/scripts/account/sign-in/default.js"></script>
 
-    @if(!string.IsNullOrWhiteSpace(Model.FacebookAppId)){
+@if (!string.IsNullOrWhiteSpace(Model.FacebookAppId))
+{
     <!-- Facebook Sign In -->
     <script src="/Areas/Frapid.Account/scripts/account/sign-in/facebook.js"></script>
-    }
+}
 
-    @if(!string.IsNullOrWhiteSpace(Model.GoogleSigninClientId)){
+@if (!string.IsNullOrWhiteSpace(Model.GoogleSigninClientId))
+{
     <!-- Google Sign In -->
     <script src="/Areas/Frapid.Account/scripts/account/sign-in/google.js"></script>
-    }
+}
 </body>
 </html>
diff --git a/src/Frapid.Web/Areas/Frapid.Account/db/PostgreSQL/1.x/1.0/account-blank.sql b/src/Frapid.Web/Areas/Frapid.Account/db/PostgreSQL/1.x/1.0/account-blank.sql
@@ -1300,6 +1300,7 @@ SELECT
     core.offices.state,
     core.offices.zip_code,
     core.offices.country,
+    core.offices.email AS office_email,
     core.offices.phone,
     core.offices.fax,
     core.offices.url,

diff --git a/...apid.Web/Areas/Frapid.Account/db/PostgreSQL/1.x/1.0/src/05.views/account.sign_in_view.sql b/...apid.Web/Areas/Frapid.Account/db/PostgreSQL/1.x/1.0/src/05.views/account.sign_in_view.sql
@@ -29,6 +29,7 @@ SELECT
     core.offices.state,
     core.offices.zip_code,
     core.offices.country,
+    core.offices.email AS office_email,
     core.offices.phone,
     core.offices.fax,
     core.offices.url,

diff --git a/src/Frapid.Web/Areas/Frapid.Account/db/PostgreSQL/account-blank.sql b/src/Frapid.Web/Areas/Frapid.Account/db/PostgreSQL/account-blank.sql
@@ -1300,6 +1300,7 @@ SELECT
     core.offices.state,
     core.offices.zip_code,
     core.offices.country,
+    core.offices.email AS office_email,
     core.offices.phone,
     core.offices.fax,
     core.offices.url,

diff --git a/src/Frapid.Web/Areas/Frapid.Account/db/SQL Server/1.x/1.0/account-blank.sql b/src/Frapid.Web/Areas/Frapid.Account/db/SQL Server/1.x/1.0/account-blank.sql
@@ -1597,6 +1597,7 @@ SELECT
     core.offices.state,
     core.offices.zip_code,
     core.offices.country,
+    core.offices.email AS office_email,
     core.offices.phone,
     core.offices.fax,
     core.offices.url,

diff --git a/...apid.Web/Areas/Frapid.Account/db/SQL Server/1.x/1.0/src/05.views/account.sign_in_view.sql b/...apid.Web/Areas/Frapid.Account/db/SQL Server/1.x/1.0/src/05.views/account.sign_in_view.sql
@@ -32,6 +32,7 @@ SELECT
     core.offices.state,
     core.offices.zip_code,
     core.offices.country,
+    core.offices.email AS office_email,
     core.offices.phone,
     core.offices.fax,
     core.offices.url,

diff --git a/src/Frapid.Web/Areas/Frapid.Account/db/SQL Server/account-blank.sql b/src/Frapid.Web/Areas/Frapid.Account/db/SQL Server/account-blank.sql
@@ -1597,6 +1597,7 @@ SELECT
     core.offices.state,
     core.offices.zip_code,
     core.offices.country,
+    core.offices.email AS office_email,
     core.offices.phone,
     core.offices.fax,
     core.offices.url,