From 1175bddd828f4bbfbe4b21045a51f473c4298a00 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Fri, 18 Dec 2020 00:44:13 +0000 Subject: [PATCH] --- server/AyaNova/biz/AyaFormFieldDefinitions.cs | 64 +++++++++++++++++++ server/AyaNova/biz/Review.cs | 9 ++- server/AyaNova/resource/de.json | 49 +++++++++++++- server/AyaNova/resource/en.json | 41 ++++++++++++ server/AyaNova/resource/es.json | 44 +++++++++++++ server/AyaNova/resource/fr.json | 45 ++++++++++++- 6 files changed, 246 insertions(+), 6 deletions(-) diff --git a/server/AyaNova/biz/AyaFormFieldDefinitions.cs b/server/AyaNova/biz/AyaFormFieldDefinitions.cs index 5573b0a6..8950eb8a 100644 --- a/server/AyaNova/biz/AyaFormFieldDefinitions.cs +++ b/server/AyaNova/biz/AyaFormFieldDefinitions.cs @@ -370,6 +370,70 @@ namespace AyaNova.Biz } #endregion + #region Reminder + { + List l = new List(); + l.Add(new AyaFormFieldDefinition { TKey = "ReminderName", FieldKey = "ReminderName", Hideable = false }); + l.Add(new AyaFormFieldDefinition { TKey = "ReminderNotes", FieldKey = "ReminderNotes", Hideable = false }); + l.Add(new AyaFormFieldDefinition { TKey = "ReminderStartDate", FieldKey = "ReminderStartDate", Hideable = false }); + l.Add(new AyaFormFieldDefinition { TKey = "ReminderStopDate", FieldKey = "ReminderStopDate", Hideable = false }); + l.Add(new AyaFormFieldDefinition { TKey = "ReminderColor", FieldKey = "ReminderColor" }); + + l.Add(new AyaFormFieldDefinition { TKey = "Tags", FieldKey = "Tags" }); + l.Add(new AyaFormFieldDefinition { TKey = "Wiki", FieldKey = "Wiki" }); + l.Add(new AyaFormFieldDefinition { TKey = "Attachments", FieldKey = "Attachments" }); + l.Add(new AyaFormFieldDefinition { TKey = "ReminderCustom1", FieldKey = "ReminderCustom1", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "ReminderCustom2", FieldKey = "ReminderCustom2", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "ReminderCustom3", FieldKey = "ReminderCustom3", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "ReminderCustom4", FieldKey = "ReminderCustom4", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "ReminderCustom5", FieldKey = "ReminderCustom5", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "ReminderCustom6", FieldKey = "ReminderCustom6", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "ReminderCustom7", FieldKey = "ReminderCustom7", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "ReminderCustom8", FieldKey = "ReminderCustom8", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "ReminderCustom9", FieldKey = "ReminderCustom9", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "ReminderCustom10", FieldKey = "ReminderCustom10", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "ReminderCustom11", FieldKey = "ReminderCustom11", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "ReminderCustom12", FieldKey = "ReminderCustom12", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "ReminderCustom13", FieldKey = "ReminderCustom13", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "ReminderCustom14", FieldKey = "ReminderCustom14", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "ReminderCustom15", FieldKey = "ReminderCustom15", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "ReminderCustom16", FieldKey = "ReminderCustom16", IsCustomField = true }); + _ayaFormFields.Add(AyaType.Reminder.ToString(), l); + } + #endregion + + #region Review + { + List l = new List(); + l.Add(new AyaFormFieldDefinition { TKey = "ReviewName", FieldKey = "ReviewName", Hideable = false }); + l.Add(new AyaFormFieldDefinition { TKey = "ReviewNotes", FieldKey = "ReviewNotes", Hideable = false }); + l.Add(new AyaFormFieldDefinition { TKey = "ReviewStartDate", FieldKey = "ReviewStartDate", Hideable = false }); + l.Add(new AyaFormFieldDefinition { TKey = "ReviewStopDate", FieldKey = "ReviewStopDate", Hideable = false }); + l.Add(new AyaFormFieldDefinition { TKey = "ReviewColor", FieldKey = "ReviewColor" }); + + l.Add(new AyaFormFieldDefinition { TKey = "Tags", FieldKey = "Tags" }); + l.Add(new AyaFormFieldDefinition { TKey = "Wiki", FieldKey = "Wiki" }); + l.Add(new AyaFormFieldDefinition { TKey = "Attachments", FieldKey = "Attachments" }); + l.Add(new AyaFormFieldDefinition { TKey = "ReviewCustom1", FieldKey = "ReviewCustom1", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "ReviewCustom2", FieldKey = "ReviewCustom2", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "ReviewCustom3", FieldKey = "ReviewCustom3", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "ReviewCustom4", FieldKey = "ReviewCustom4", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "ReviewCustom5", FieldKey = "ReviewCustom5", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "ReviewCustom6", FieldKey = "ReviewCustom6", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "ReviewCustom7", FieldKey = "ReviewCustom7", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "ReviewCustom8", FieldKey = "ReviewCustom8", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "ReviewCustom9", FieldKey = "ReviewCustom9", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "ReviewCustom10", FieldKey = "ReviewCustom10", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "ReviewCustom11", FieldKey = "ReviewCustom11", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "ReviewCustom12", FieldKey = "ReviewCustom12", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "ReviewCustom13", FieldKey = "ReviewCustom13", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "ReviewCustom14", FieldKey = "ReviewCustom14", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "ReviewCustom15", FieldKey = "ReviewCustom15", IsCustomField = true }); + l.Add(new AyaFormFieldDefinition { TKey = "ReviewCustom16", FieldKey = "ReviewCustom16", IsCustomField = true }); + _ayaFormFields.Add(AyaType.Review.ToString(), l); + } + #endregion + #region Part { List l = new List(); diff --git a/server/AyaNova/biz/Review.cs b/server/AyaNova/biz/Review.cs index 80e1c570..0461d406 100644 --- a/server/AyaNova/biz/Review.cs +++ b/server/AyaNova/biz/Review.cs @@ -270,8 +270,15 @@ namespace AyaNova.Biz return; } } + + //Does the object of this Review actually exist? + if (!await BizObjectExistsInDatabase.ExistsAsync(proposedObj.ObjectType, proposedObj.ObjectId, ct)) + { + AddError(ApiErrorCode.NOT_FOUND, "generalerror", $"LT:ErrorAPI2010 LT:{proposedObj.ObjectType} id {proposedObj.ObjectId}"); + return; + } - //Name required + //Name required if (string.IsNullOrWhiteSpace(proposedObj.Name)) AddError(ApiErrorCode.VALIDATION_REQUIRED, "Name"); diff --git a/server/AyaNova/resource/de.json b/server/AyaNova/resource/de.json index 6d416f2e..d138e41a 100644 --- a/server/AyaNova/resource/de.json +++ b/server/AyaNova/resource/de.json @@ -815,6 +815,22 @@ "ReminderSourceID": "Quelle", "ReminderStartDate": "Start", "ReminderStopDate": "Ende", + "ReminderCustom1": "Angepasstes Feld 1", + "ReminderCustom2": "Angepasstes Feld 2", + "ReminderCustom3": "Angepasstes Feld 3", + "ReminderCustom4": "Angepasstes Feld 4", + "ReminderCustom5": "Angepasstes Feld 5", + "ReminderCustom6": "Angepasstes Feld 6", + "ReminderCustom7": "Angepasstes Feld 7", + "ReminderCustom8": "Angepasstes Feld 8", + "ReminderCustom9": "Angepasstes Feld 9", + "ReminderCustom10": "Angepasstes Feld 10", + "ReminderCustom11": "Angepasstes Feld 11", + "ReminderCustom12": "Angepasstes Feld 12", + "ReminderCustom13": "Angepasstes Feld 13", + "ReminderCustom14": "Angepasstes Feld 14", + "ReminderCustom15": "Angepasstes Feld 15", + "ReminderCustom16": "Angepasstes Feld 16", "SearchResultDescription": "Beschreibung", "SearchResultExtract": "Extrahieren", "SearchResultRank": "Rang", @@ -1656,6 +1672,33 @@ "ServerMetrics": "Server-Metriken", "NotificationSettings": "Benachrichtigungseinstellungen", "Review": "Überprüfung", + + "ReviewList": "Reviews", + "ReviewOverDue": "Overdue", + "ReviewName": "Name", + "ReviewNotes": "Notes", + "ReviewDueDate": "Due", + "ReviewCompletedDate": "Completed", + "ReviewCompletionNotes": "Completion notes", + "ReviewUserId": "Assigned to", + "ReviewAssignedByUserId": "Assigned by", + "ReviewCustom1": "Angepasstes Feld 1", + "ReviewCustom2": "Angepasstes Feld 2", + "ReviewCustom3": "Angepasstes Feld 3", + "ReviewCustom4": "Angepasstes Feld 4", + "ReviewCustom5": "Angepasstes Feld 5", + "ReviewCustom6": "Angepasstes Feld 6", + "ReviewCustom7": "Angepasstes Feld 7", + "ReviewCustom8": "Angepasstes Feld 8", + "ReviewCustom9": "Angepasstes Feld 9", + "ReviewCustom10": "Angepasstes Feld 10", + "ReviewCustom11": "Angepasstes Feld 11", + "ReviewCustom12": "Angepasstes Feld 12", + "ReviewCustom13": "Angepasstes Feld 13", + "ReviewCustom14": "Angepasstes Feld 14", + "ReviewCustom15": "Angepasstes Feld 15", + "ReviewCustom16": "Angepasstes Feld 16", + "UserSettings": "Benutzereinstellungen", "DataListView": "Datenlistenansicht", "Include": "Umfassen", @@ -1828,7 +1871,7 @@ "BackupFiles": "Liste der Sicherungsdateien", "BackupNow": "Starten Sie jetzt das Backup", "AreYouSureBackupNow": "Der Server wird während der Sicherung gesperrt. Bist du sicher?", - "BackupDeleteOld":"Alte Sicherungsdateien löschen", + "BackupDeleteOld": "Alte Sicherungsdateien löschen", "FileName": "Name", "FileSize": "Größe", "FileDate": "Datum", @@ -1978,10 +2021,10 @@ "CopyToClipboard": "In die Zwischenablage kopieren", "VendorPopUpNotes": "Popup-Notizen", "EraseMultipleObjectsWarning": "Warnung: Sie sind dabei, mehrere Objekte dauerhaft zu löschen.\nBist du sicher?", - "Errors":"Fehler", + "Errors": "Fehler", "BatchDeleteJob": "Batch-Löschauftrag", "BatchJob": "Batch-Job", "Failed": "Fehlgeschlagen", "ProcessingJob": "Serverjob verarbeiten", - "TimedOut":"Zeitüberschreitung" + "TimedOut": "Zeitüberschreitung" } \ No newline at end of file diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json index 271adaa5..7d2b2e05 100644 --- a/server/AyaNova/resource/en.json +++ b/server/AyaNova/resource/en.json @@ -815,6 +815,22 @@ "ReminderSourceID": "Source", "ReminderStartDate": "Start", "ReminderStopDate": "Stop", + "ReminderCustom1": "Custom1", + "ReminderCustom2": "Custom2", + "ReminderCustom3": "Custom3", + "ReminderCustom4": "Custom4", + "ReminderCustom5": "Custom5", + "ReminderCustom6": "Custom6", + "ReminderCustom7": "Custom7", + "ReminderCustom8": "Custom8", + "ReminderCustom9": "Custom9", + "ReminderCustom10": "Custom10", + "ReminderCustom11": "Custom11", + "ReminderCustom12": "Custom12", + "ReminderCustom13": "Custom13", + "ReminderCustom14": "Custom14", + "ReminderCustom15": "Custom15", + "ReminderCustom16": "Custom16", "SearchResultDescription": "Description", "SearchResultExtract": "Extract", "SearchResultRank": "Rank", @@ -1656,6 +1672,31 @@ "ServerMetrics": "Server metrics", "NotificationSettings": "Notification settings", "Review": "Review", + "ReviewList": "Reviews", + "ReviewOverDue": "Overdue", + "ReviewName": "Name", + "ReviewNotes": "Notes", + "ReviewDueDate": "Due", + "ReviewCompletedDate": "Completed", + "ReviewCompletionNotes": "Completion notes", + "ReviewUserId": "Assigned to", + "ReviewAssignedByUserId": "Assigned by", + "ReviewCustom1": "Custom1", + "ReviewCustom2": "Custom2", + "ReviewCustom3": "Custom3", + "ReviewCustom4": "Custom4", + "ReviewCustom5": "Custom5", + "ReviewCustom6": "Custom6", + "ReviewCustom7": "Custom7", + "ReviewCustom8": "Custom8", + "ReviewCustom9": "Custom9", + "ReviewCustom10": "Custom10", + "ReviewCustom11": "Custom11", + "ReviewCustom12": "Custom12", + "ReviewCustom13": "Custom13", + "ReviewCustom14": "Custom14", + "ReviewCustom15": "Custom15", + "ReviewCustom16": "Custom16", "UserSettings": "User settings", "DataListView": "List view", "Include": "Include", diff --git a/server/AyaNova/resource/es.json b/server/AyaNova/resource/es.json index 0edecb29..04735ec7 100644 --- a/server/AyaNova/resource/es.json +++ b/server/AyaNova/resource/es.json @@ -814,6 +814,22 @@ "ReminderSourceID": "Origen", "ReminderStartDate": "Inicio", "ReminderStopDate": "Fin", + "ReminderCustom1": "Campo personalizado 1", + "ReminderCustom2": "Campo personalizado 2", + "ReminderCustom3": "Campo personalizado 3", + "ReminderCustom4": "Campo personalizado 4", + "ReminderCustom5": "Campo personalizado 5", + "ReminderCustom6": "Campo personalizado 6", + "ReminderCustom7": "Campo personalizado 7", + "ReminderCustom8": "Campo personalizado 8", + "ReminderCustom9": "Campo personalizado 9", + "ReminderCustom10": "Campo personalizado 10", + "ReminderCustom11": "Campo personalizado 11", + "ReminderCustom12": "Campo personalizado 12", + "ReminderCustom13": "Campo personalizado 13", + "ReminderCustom14": "Campo personalizado 14", + "ReminderCustom15": "Campo personalizado 15", + "ReminderCustom16": "Campo personalizado 16", "SearchResultDescription": "Descripción", "SearchResultExtract": "Extracto", "SearchResultRank": "Rango", @@ -1656,6 +1672,34 @@ "ServerMetrics": "Métricas del servidor", "NotificationSettings": "Configuración de notificaciones", "Review": "Revisión", + + + "ReviewList": "Reviews", + "ReviewOverDue": "Overdue", + "ReviewName": "Name", + "ReviewNotes": "Notes", + "ReviewDueDate": "Due", + "ReviewCompletedDate": "Completed", + "ReviewCompletionNotes": "Completion notes", + "ReviewUserId": "Assigned to", + "ReviewAssignedByUserId": "Assigned by", + "ReviewCustom1": "Campo personalizado 1", + "ReviewCustom2": "Campo personalizado 2", + "ReviewCustom3": "Campo personalizado 3", + "ReviewCustom4": "Campo personalizado 4", + "ReviewCustom5": "Campo personalizado 5", + "ReviewCustom6": "Campo personalizado 6", + "ReviewCustom7": "Campo personalizado 7", + "ReviewCustom8": "Campo personalizado 8", + "ReviewCustom9": "Campo personalizado 9", + "ReviewCustom10": "Campo personalizado 10", + "ReviewCustom11": "Campo personalizado 11", + "ReviewCustom12": "Campo personalizado 12", + "ReviewCustom13": "Campo personalizado 13", + "ReviewCustom14": "Campo personalizado 14", + "ReviewCustom15": "Campo personalizado 15", + "ReviewCustom16": "Campo personalizado 16", + "UserSettings": "Configuración de usuario", "DataListView": "Vista de lista de datos", "Include": "Incluir", diff --git a/server/AyaNova/resource/fr.json b/server/AyaNova/resource/fr.json index f10f78fd..03a83f48 100644 --- a/server/AyaNova/resource/fr.json +++ b/server/AyaNova/resource/fr.json @@ -815,6 +815,22 @@ "ReminderSourceID": "Source", "ReminderStartDate": "Début", "ReminderStopDate": "Fin", + "ReminderCustom1": "Champ personnalisé 1", + "ReminderCustom2": "Champ personnalisé 2", + "ReminderCustom3": "Champ personnalisé 3", + "ReminderCustom4": "Champ personnalisé 4", + "ReminderCustom5": "Champ personnalisé 5", + "ReminderCustom6": "Champ personnalisé 6", + "ReminderCustom7": "Champ personnalisé 7", + "ReminderCustom8": "Champ personnalisé 8", + "ReminderCustom9": "Champ personnalisé 9", + "ReminderCustom10": "Champ personnalisé 10", + "ReminderCustom11": "Champ personnalisé 11", + "ReminderCustom12": "Champ personnalisé 12", + "ReminderCustom13": "Champ personnalisé 13", + "ReminderCustom14": "Champ personnalisé 14", + "ReminderCustom15": "Champ personnalisé 15", + "ReminderCustom16": "Champ personnalisé 16", "SearchResultDescription": "Description", "SearchResultExtract": "Extrait", "SearchResultRank": "Rang", @@ -1656,6 +1672,31 @@ "ServerMetrics": "Mesure du serveur", "NotificationSettings": "Paramètres de notification", "Review": "Évaluation", + "ReviewList": "Liste d'évaluation", + "ReviewOverDue": "Overdue", + "ReviewName": "Nom", + "ReviewNotes": "Notes", + "ReviewDueDate": "Dû", + "ReviewCompletedDate": "Date de fin", + "ReviewCompletionNotes": "Notes d'achèvement", + "ReviewUserId": "Assigné à", + "ReviewAssignedByUserId": "Assigné par", + "ReviewCustom1": "Champ personnalisé 1", + "ReviewCustom2": "Champ personnalisé 2", + "ReviewCustom3": "Champ personnalisé 3", + "ReviewCustom4": "Champ personnalisé 4", + "ReviewCustom5": "Champ personnalisé 5", + "ReviewCustom6": "Champ personnalisé 6", + "ReviewCustom7": "Champ personnalisé 7", + "ReviewCustom8": "Champ personnalisé 8", + "ReviewCustom9": "Champ personnalisé 9", + "ReviewCustom10": "Champ personnalisé 10", + "ReviewCustom11": "Champ personnalisé 11", + "ReviewCustom12": "Champ personnalisé 12", + "ReviewCustom13": "Champ personnalisé 13", + "ReviewCustom14": "Champ personnalisé 14", + "ReviewCustom15": "Champ personnalisé 15", + "ReviewCustom16": "Champ personnalisé 16", "UserSettings": "Paramètres utilisateur", "DataListView": "Affichage de la liste des données", "Include": "Inclure", @@ -1828,7 +1869,7 @@ "BackupFiles": "Liste des fichiers de sauvegarde", "BackupNow": "Lancer la sauvegarde maintenant", "AreYouSureBackupNow": "Le serveur sera verrouillé pendant la sauvegarde. Êtes-vous sûr?", - "BackupDeleteOld":"Suppression des anciens fichiers de sauvegarde", + "BackupDeleteOld": "Suppression des anciens fichiers de sauvegarde", "FileName": "Nom", "FileSize": "Taille", "FileDate": "Date", @@ -1983,5 +2024,5 @@ "BatchJob": "Travail par lots", "Failed": "Échec", "ProcessingJob": "Traitement du travail du serveur", - "TimedOut":"Délai dépassé" + "TimedOut": "Délai dépassé" } \ No newline at end of file