admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2022-08-26 20:40:44 +00:00
parent 8fcee1f57b
commit c66a48b641
3 changed files with 49 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
server/AyaNova/util/AySchema.cs
View File

@@ -20,7 +20,7 @@ namespace AyaNova.Util
/////////// CHANGE THIS ON NEW SCHEMA UPDATE ////////////////////
//!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImportingAsync WHEN NEW TABLES ADDED!!!!
private const int DESIRED_SCHEMA_LEVEL = 6;
private const int DESIRED_SCHEMA_LEVEL = 7;
internal const long EXPECTED_COLUMN_COUNT = 1377;
internal const long EXPECTED_INDEX_COUNT = 161;
@@ -1523,7 +1523,7 @@ $BODY$ LANGUAGE PLPGSQL STABLE");
await ExecQueryAsync("ALTER TABLE auser ADD column allowlogin BOOL");
await ExecQueryAsync("UPDATE auser SET allowlogin=true WHERE active=true");
//english translations
await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'AllowLogin', 'Allow login' FROM atranslation t where t.baselanguage = 'en'");
@@ -1536,9 +1536,40 @@ $BODY$ LANGUAGE PLPGSQL STABLE");
//german translations
await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'AllowLogin', 'Login erlauben' FROM atranslation t where t.baselanguage = 'de'");
await SetSchemaLevelAsync(++currentSchema);
}
//////////////////////////////////////////////////
//
// 8.0.8 additions for license related display
//
if (currentSchema < 7)
{
LogUpdateMessage(log);
//english translations
await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'ActiveTechUserCount', 'Active scheduleable Users' FROM atranslation t where t.baselanguage = 'en'");
await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'ActiveCustomerContactUserCount', 'Active Customer Contact login Users' FROM atranslation t where t.baselanguage = 'en'");
await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'ActiveInternalUserCount', 'Active internal Users' FROM atranslation t where t.baselanguage = 'en'");
//spanish translations
await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'ActiveTechUserCount', 'Técnico de horario activo Usuarios' FROM atranslation t where t.baselanguage = 'es'");
await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'ActiveCustomerContactUserCount', 'Usuarios de inicio de sesión de contacto de cliente activo' FROM atranslation t where t.baselanguage = 'es'");
await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'ActiveInternalUserCount', 'Usuarios internos activos' FROM atranslation t where t.baselanguage = 'es'");
//french translations
await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'ActiveTechUserCount', 'Utilisateurs planifiables actifs' FROM atranslation t where t.baselanguage = 'fr'");
await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'ActiveCustomerContactUserCount', 'Utilisateurs de connexion de contact client actifs' FROM atranslation t where t.baselanguage = 'fr'");
await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'ActiveInternalUserCount', 'Utilisateurs internes actifs' FROM atranslation t where t.baselanguage = 'fr'");
//german translations
await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'ActiveTechUserCount', 'Aktive planbare Benutzer' FROM atranslation t where t.baselanguage = 'de'");
await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'ActiveCustomerContactUserCount', 'Aktive Kundenkontakt-Login-Benutzer' FROM atranslation t where t.baselanguage = 'de'");
await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'ActiveInternalUserCount', 'Aktive interne Benutzer' FROM atranslation t where t.baselanguage = 'de'");
await SetSchemaLevelAsync(++currentSchema);
}
//#########################################
//!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImporting WHEN NEW TABLES ADDED!!!!

12
server/AyaNova/util/License.cs
View File

@@ -453,9 +453,15 @@ namespace AyaNova.Core
Feature = f.Feature,
Count = f.Count
},
activeTechUserCount=AyaNova.Biz.UserBiz.ActiveTechUserCountAsync().Result,
activeCustomerContactUserCount=AyaNova.Biz.UserBiz.ActiveCustomerContactUserCountAsync().Result,
activeInternalUserCount=AyaNova.Biz.UserBiz.ActiveInternalUserCountAsync().Result
serverVersion = AyaNovaVersion.FullNameAndVersion,
#if (SUBSCRIPTION_BUILD)
build = "Subscription",
#else
build = "Perpetual",
#endif
activeTechUserCount = AyaNova.Biz.UserBiz.ActiveTechUserCountAsync().Result,
activeCustomerContactUserCount = AyaNova.Biz.UserBiz.ActiveCustomerContactUserCountAsync().Result,
activeInternalUserCount = AyaNova.Biz.UserBiz.ActiveInternalUserCountAsync().Result
}
});
return o;