diff --git a/server/AyaNova/DataList/MemoDataList.cs b/server/AyaNova/DataList/MemoDataList.cs index ac79898e..3e61c584 100644 --- a/server/AyaNova/DataList/MemoDataList.cs +++ b/server/AyaNova/DataList/MemoDataList.cs @@ -38,6 +38,20 @@ namespace AyaNova.DataList //NOTE: Due to the join, all the sql id and name fields that can conflict with the joined table need to be specified completely FieldDefinitions = new List(); + + +FieldDefinitions.Add(new AyaDataListFieldDefinition + { + TKey = "MemoSubject", + FieldKey = "MemoSubject", + AyaObjectType = (int)AyaType.Memo, + UiFieldDataType = (int)UiFieldDataType.Text, + SqlIdColumnName = "amemo.id", + SqlValueColumnName = "amemo.name", + IsRowId = true + }); + + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "User", @@ -50,16 +64,7 @@ namespace AyaNova.DataList }); - FieldDefinitions.Add(new AyaDataListFieldDefinition - { - TKey = "MemoNotes", - FieldKey = "notes", - AyaObjectType = (int)AyaType.Memo, - UiFieldDataType = (int)UiFieldDataType.Text, - SqlIdColumnName = "amemo.id", - SqlValueColumnName = "amemo.notes", - IsRowId = true - }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { @@ -79,6 +84,30 @@ namespace AyaNova.DataList }); } + + + + + + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom1", FieldKey = "customercustom1", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom2", FieldKey = "customercustom2", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom3", FieldKey = "customercustom3", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom4", FieldKey = "customercustom4", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom5", FieldKey = "customercustom5", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom6", FieldKey = "customercustom6", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom7", FieldKey = "customercustom7", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom8", FieldKey = "customercustom8", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom9", FieldKey = "customercustom9", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom10", FieldKey = "customercustom10", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom11", FieldKey = "customercustom11", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom12", FieldKey = "customercustom12", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom13", FieldKey = "customercustom13", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom14", FieldKey = "customercustom14", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom15", FieldKey = "customercustom15", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" }); + FieldDefinitions.Add(new AyaDataListFieldDefinition { TKey = "CustomerCustom16", FieldKey = "customercustom16", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "acustomer.customfields" }); + + + string IAyaDataListViewServerCriteria.ListViewServerCriteria(long userId) { //todo: take user id here and return additional criteria listview diff --git a/server/AyaNova/resource/de.json b/server/AyaNova/resource/de.json index e6d08290..6d416f2e 100644 --- a/server/AyaNova/resource/de.json +++ b/server/AyaNova/resource/de.json @@ -393,6 +393,22 @@ "MemoSubject": "Betreff", "MemoToID": "An", "MemoViewed": "Angezeigt", + "MemoCustom1": "Angepasstes Feld 1", + "MemoCustom2": "Angepasstes Feld 2", + "MemoCustom3": "Angepasstes Feld 3", + "MemoCustom4": "Angepasstes Feld 4", + "MemoCustom5": "Angepasstes Feld 5", + "MemoCustom6": "Angepasstes Feld 6", + "MemoCustom7": "Angepasstes Feld 7", + "MemoCustom8": "Angepasstes Feld 8", + "MemoCustom9": "Angepasstes Feld 9", + "MemoCustom10": "Angepasstes Feld 10", + "MemoCustom11": "Angepasstes Feld 11", + "MemoCustom12": "Angepasstes Feld 12", + "MemoCustom13": "Angepasstes Feld 13", + "MemoCustom14": "Angepasstes Feld 14", + "MemoCustom15": "Angepasstes Feld 15", + "MemoCustom16": "Angepasstes Feld 16", "NotifyNotificationMessage": "Nachricht", "NotifySourceOfEvent": "Quelle", "NotifyDeliveryLogDelivered": "Lieferung erfolgreich", diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json index 6632eeff..271adaa5 100644 --- a/server/AyaNova/resource/en.json +++ b/server/AyaNova/resource/en.json @@ -393,6 +393,22 @@ "MemoSubject": "Subject", "MemoToID": "To", "MemoViewed": "Viewed", + "MemoCustom1": "Custom1", + "MemoCustom2": "Custom2", + "MemoCustom3": "Custom3", + "MemoCustom4": "Custom4", + "MemoCustom5": "Custom5", + "MemoCustom6": "Custom6", + "MemoCustom7": "Custom7", + "MemoCustom8": "Custom8", + "MemoCustom9": "Custom9", + "MemoCustom10": "Custom10", + "MemoCustom11": "Custom11", + "MemoCustom12": "Custom12", + "MemoCustom13": "Custom13", + "MemoCustom14": "Custom14", + "MemoCustom15": "Custom15", + "MemoCustom16": "Custom16", "NotifyNotificationMessage": "Message", "NotifySourceOfEvent": "Source", "NotifyDeliveryLogDelivered": "Delivery sucessful", diff --git a/server/AyaNova/resource/es.json b/server/AyaNova/resource/es.json index ae3a0ca2..0edecb29 100644 --- a/server/AyaNova/resource/es.json +++ b/server/AyaNova/resource/es.json @@ -393,6 +393,22 @@ "MemoSubject": "Asunto", "MemoToID": "A", "MemoViewed": "Visualizado", + "MemoCustom1": "Campo personalizado 1", + "MemoCustom2": "Campo personalizado 2", + "MemoCustom3": "Campo personalizado 3", + "MemoCustom4": "Campo personalizado 4", + "MemoCustom5": "Campo personalizado 5", + "MemoCustom6": "Campo personalizado 6", + "MemoCustom7": "Campo personalizado 7", + "MemoCustom8": "Campo personalizado 8", + "MemoCustom9": "Campo personalizado 9", + "MemoCustom10": "Campo personalizado 10", + "MemoCustom11": "Campo personalizado 11", + "MemoCustom12": "Campo personalizado 12", + "MemoCustom13": "Campo personalizado 13", + "MemoCustom14": "Campo personalizado 14", + "MemoCustom15": "Campo personalizado 15", + "MemoCustom16": "Campo personalizado 16", "NotifyNotificationMessage": "Mensaje", "NotifySourceOfEvent": "Origen", "NotifyDeliveryLogDelivered": "Envío correcto", diff --git a/server/AyaNova/resource/fr.json b/server/AyaNova/resource/fr.json index d26c4142..f10f78fd 100644 --- a/server/AyaNova/resource/fr.json +++ b/server/AyaNova/resource/fr.json @@ -393,6 +393,22 @@ "MemoSubject": "Objet", "MemoToID": "À", "MemoViewed": "Lu", + "MemoCustom1": "Champ personnalisé 1", + "MemoCustom2": "Champ personnalisé 2", + "MemoCustom3": "Champ personnalisé 3", + "MemoCustom4": "Champ personnalisé 4", + "MemoCustom5": "Champ personnalisé 5", + "MemoCustom6": "Champ personnalisé 6", + "MemoCustom7": "Champ personnalisé 7", + "MemoCustom8": "Champ personnalisé 8", + "MemoCustom9": "Champ personnalisé 9", + "MemoCustom10": "Champ personnalisé 10", + "MemoCustom11": "Champ personnalisé 11", + "MemoCustom12": "Champ personnalisé 12", + "MemoCustom13": "Champ personnalisé 13", + "MemoCustom14": "Champ personnalisé 14", + "MemoCustom15": "Champ personnalisé 15", + "MemoCustom16": "Champ personnalisé 16", "NotifyNotificationMessage": "Message", "NotifySourceOfEvent": "Source", "NotifyDeliveryLogDelivered": "Transmission effectuée",