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-05-26 18:59:37 +00:00
parent 21655825b9
commit ba29f5dbff
17 changed files with 45 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/AyaNova/DataList/LoanUnitDataList.cs
View File

@@ -120,14 +120,14 @@ namespace AyaNova.DataList
SqlValueColumnName = "aloanunit.rateyear"
});
FieldDefinitions.Add(new DataListFieldDefinition
{
TKey = "LoanUnitDefaultRate",
FieldKey = "LoanUnitDefaultRate",
UiFieldDataType = (int)UiFieldDataType.Enum,
EnumType = AyaNova.Util.StringUtil.TrimTypeName(typeof(LoanUnitRateUnit).ToString()),
SqlValueColumnName = "aloanunit.defaultrate"
});
// FieldDefinitions.Add(new DataListFieldDefinition
// {
// TKey = "LoanUnitDefaultRate",
// FieldKey = "LoanUnitDefaultRate",
// UiFieldDataType = (int)UiFieldDataType.Enum,
// EnumType = AyaNova.Util.StringUtil.TrimTypeName(typeof(LoanUnitRateUnit).ToString()),
// SqlValueColumnName = "aloanunit.defaultrate"
// });
FieldDefinitions.Add(new DataListFieldDefinition
{

2
server/AyaNova/biz/FormFieldReference.cs
View File

@@ -270,7 +270,7 @@ namespace AyaNova.Biz
l.Add(new FormField { TKey = "LoanUnitRateWeekCost", FieldKey = "RateWeekCost" });
l.Add(new FormField { TKey = "LoanUnitRateMonthCost", FieldKey = "RateMonthCost" });
l.Add(new FormField { TKey = "LoanUnitRateYearCost", FieldKey = "RateYearCost" });
l.Add(new FormField { TKey = "LoanUnitDefaultRate", FieldKey = "DefaultRate" });
//l.Add(new FormField { TKey = "LoanUnitDefaultRate", FieldKey = "DefaultRate" });
l.Add(new FormField { TKey = "LoanUnitShadowUnit", FieldKey = "UnitId" });
l.Add(new FormField { TKey = "LoanUnitNotes", FieldKey = "Notes" });
l.Add(new FormField { TKey = "Tags", FieldKey = "Tags" });

6
server/AyaNova/models/LoanUnit.cs
View File

@@ -56,8 +56,8 @@ namespace AyaNova.Models
[Required]
public decimal RateYearCost { get; set; }
[Required]
public LoanUnitRateUnit DefaultRate { get; set; }
// [Required]
// public LoanUnitRateUnit DefaultRate { get; set; }
public long? UnitId { get; set; }//Shadow unit
[NotMapped]
@@ -82,7 +82,7 @@ namespace AyaNova.Models
public LoanUnit()
{
Tags = new List<string>();
DefaultRate = LoanUnitRateUnit.Days;
// DefaultRate = LoanUnitRateUnit.Days;
}
[NotMapped, JsonIgnore]

1
server/AyaNova/resource/de.json
View File

@@ -515,7 +515,6 @@
"LoanUnitCustom7": "Angepasstes Feld 7",
"LoanUnitCustom8": "Angepasstes Feld 8",
"LoanUnitCustom9": "Angepasstes Feld 9",
"LoanUnitDefaultRate": "Standardrate",
"LoanUnitList": "Leihposten",
"LoanUnitName": "Name",
"LoanUnitNotes": "Anmerkungen",

1
server/AyaNova/resource/en.json
View File

@@ -515,7 +515,6 @@
"LoanUnitCustom7": "Custom7",
"LoanUnitCustom8": "Custom8",
"LoanUnitCustom9": "Custom9",
"LoanUnitDefaultRate": "Default rate",
"LoanUnitList": "Loaner Items",
"LoanUnitName": "Name",
"LoanUnitNotes": "Notes",

1
server/AyaNova/resource/es.json
View File

@@ -515,7 +515,6 @@
"LoanUnitCustom7": "Campo personalizado 7",
"LoanUnitCustom8": "Campo personalizado 8",
"LoanUnitCustom9": "Campo personalizado 9",
"LoanUnitDefaultRate": "Tasa de incumplimiento",
"LoanUnitList": "Elementos préstamo",
"LoanUnitName": "Nombre",
"LoanUnitNotes": "Notas",

1
server/AyaNova/resource/fr.json
View File

@@ -515,7 +515,6 @@
"LoanUnitCustom7": "Champ personnalisé 7",
"LoanUnitCustom8": "Champ personnalisé 8",
"LoanUnitCustom9": "Champ personnalisé 9",
"LoanUnitDefaultRate": "Taux de défaut",
"LoanUnitList": "Éléments de prêt",
"LoanUnitName": "Nom",
"LoanUnitNotes": "Remarques",

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

@@ -20,9 +20,9 @@ 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 = 2;
private const int DESIRED_SCHEMA_LEVEL = 3;
internal const long EXPECTED_COLUMN_COUNT = 1360;
internal const long EXPECTED_COLUMN_COUNT = 1359;
internal const long EXPECTED_INDEX_COUNT = 156;
internal const long EXPECTED_CHECK_CONSTRAINTS = 549;
internal const long EXPECTED_FOREIGN_KEY_CONSTRAINTS = 202;
@@ -1298,23 +1298,37 @@ $BODY$ LANGUAGE PLPGSQL STABLE");
await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'UpdateExistingRecords', 'Actualizar registros existentes' FROM atranslation t where t.baselanguage = 'es'");
await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'AdminImportUpdateWarning', 'Advertencia: está a punto de cambiar varios objetos de forma permanente.\r\n¿Está seguro?' FROM atranslation t where t.baselanguage = 'es'");
await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'FileToImport', 'Archivo a importar' FROM atranslation t where t.baselanguage = 'es'");
await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'ProcessCompleted', 'Proceso completado' FROM atranslation t where t.baselanguage = 'es'");
await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'ProcessCompleted', 'Proceso completado' FROM atranslation t where t.baselanguage = 'es'");
//french translations
await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'ImportNewRecords', 'Importer de nouveaux enregistrements' FROM atranslation t where t.baselanguage = 'fr'");
await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'UpdateExistingRecords', 'Mettre à jour les enregistrements existants' FROM atranslation t where t.baselanguage = 'fr'");
await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'AdminImportUpdateWarning', 'Avertissement: vous êtes sur le point de modifier définitivement plusieurs objets.\r\nÊtes-vous sûr?' FROM atranslation t where t.baselanguage = 'fr'");
await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'FileToImport', 'Fichier à importer' FROM atranslation t where t.baselanguage = 'fr'");
await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'ProcessCompleted', 'Processus terminé' FROM atranslation t where t.baselanguage = 'fr'");
await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'ProcessCompleted', 'Processus terminé' FROM atranslation t where t.baselanguage = 'fr'");
//german translations
await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'ImportNewRecords', 'Importieren Sie neue Datensätze' FROM atranslation t where t.baselanguage = 'de'");
await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'UpdateExistingRecords', 'Aktualisieren Sie vorhandene Datensätze' FROM atranslation t where t.baselanguage = 'de'");
await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'AdminImportUpdateWarning', 'Warnung: Sie sind dabei, mehrere Objekte dauerhaft zu ändern.\r\nSind Sie sicher?' FROM atranslation t where t.baselanguage = 'de'");
await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'FileToImport', 'Zu importierende Datei' FROM atranslation t where t.baselanguage = 'de'");
await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'ProcessCompleted', 'Prozess abgeschlossen' FROM atranslation t where t.baselanguage = 'de'");
await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'ProcessCompleted', 'Prozess abgeschlossen' FROM atranslation t where t.baselanguage = 'de'");
await SetSchemaLevelAsync(++currentSchema);
}
////////////////////////////////////////////////
// rc 1 remove default rate from loan unit
//
if (currentSchema < 3)
{
LogUpdateMessage(log);
await ExecQueryAsync("DELETE FROM atranslationitem where key = 'LoanUnitDefaultRate'");
await ExecQueryAsync("ALTER TABLE aloanunit DROP COLUMN defaultrate;");
await SetSchemaLevelAsync(++currentSchema);
}
//#########################################
//!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImporting WHEN NEW TABLES ADDED!!!!

2
server/AyaNova/util/AyaNovaVersion.cs
View File

@@ -5,7 +5,7 @@ namespace AyaNova.Util
/// </summary>
internal static class AyaNovaVersion
{
public const string VersionString = "8.0.0-beta.6";
public const string VersionString = "8.0.0-rc.1";
public const string FullNameAndVersion = "AyaNova server " + VersionString;
public const string CurrentApiVersion="v8";
}//eoc

2
server/AyaNova/util/Seeder.cs
View File

@@ -2407,7 +2407,7 @@ namespace AyaNova.Util
o.RateMonthCost = MoneyUtil.Round(o.RateMonth / 2);
o.RateYear = MoneyUtil.Round(o.RateHour * 36.8m * 52);
o.RateYearCost = MoneyUtil.Round(o.RateYear / 2);
o.DefaultRate = Fake.Random.Enum<LoanUnitRateUnit>();
//o.DefaultRate = Fake.Random.Enum<LoanUnitRateUnit>();
using (AyContext ct = ServiceProviderProvider.DBContext)