Skip to content
Snippets Groups Projects
Commit 1bd5f469 authored by Sebastian Listl's avatar Sebastian Listl :speech_balloon:
Browse files

refactor!: removed home dashboard and some usersettings

parent d069019a
No related branches found
No related tags found
3 merge requests!39Beta,!34Dev,!31clean language files, prefix keys
Hide whitespace changes
Inline Side-by-side
Showing
with 5 additions and 208 deletions
entity/Context_entity/entityfields/visitplanentrylinkable_s/children/blacklist_param/valueProcess.js deleted 100644 → 0
+ 0
− 3
View file @ d069019a
import { result } from "@aditosoftware/jdito-types";
result.object(["Salesproject", "Offer"]);
entity/Object_entity/recordcontainers/jdito/contentProcess.js
+ 2
− 2
View file @ 1bd5f469
......@@ -16,9 +16,9 @@ if (vars.get("$param.ObjectType_param"))
}
var contactId;
if (vars.exists("$param.ContactId") && vars.get("$param.ContactId"))
if (vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param"))
{
contactId = vars.get("$param.ContactId");
contactId = vars.get("$param.ContactId_param");
}
result.object(ContextUtils.loadContent(ProjectModelUtils.getEntityByContext(objectType), [contactId], ["#UID", "#CONTENTTITLE"], excludedIds));
......
entity/Usersettings_entity/Usersettings_entity.aod
+ 3
− 52
View file @ 1bd5f469
......@@ -81,49 +81,6 @@
<name>#PROVIDER_AGGREGATES</name>
<useAggregates v="true" />
</entityProvider>
<entityField>
<name>userCurrency</name>
<title>root.Usersettings_entity.userCurrency.title</title>
<consumer/>
<dropDownProcess>%aditoprj%/entity/Usersettings_entity/entityfields/usercurrency/dropDownProcess.js</dropDownProcess>
<displayValueProcess>%aditoprj%/entity/Usersettings_entity/entityfields/usercurrency/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>incomingCallContext</name>
<title>root.Usersettings_entity.incomingCallContext.title</title>
<consumer>KeywordIncomingCallContext_consumer</consumer>
<displayValueProcess>%aditoprj%/entity/Usersettings_entity/entityfields/incomingcallcontext/displayValueProcess.js</displayValueProcess>
</entityField>
<entityConsumer>
<name>KeywordIncomingCallContext_consumer</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Usersettings_entity/entityfields/keywordincomingcallcontext_consumer/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
<entityField>
<name>prefferredApprover</name>
<documentation>%aditoprj%/entity/Usersettings_entity/entityfields/prefferredapprover/documentation.adoc</documentation>
<title>root.Usersettings_entity.prefferredApprover.title</title>
<description>used by &quot;Approval Workflows&quot;</description>
<consumer>Employees</consumer>
<displayValueProcess>%aditoprj%/entity/Usersettings_entity/entityfields/prefferredapprover/displayValueProcess.js</displayValueProcess>
</entityField>
<entityConsumer>
<name>Employees</name>
<dependency>
<name>dependency</name>
<entityName>Employee_entity</entityName>
<fieldName>Employees</fieldName>
</dependency>
</entityConsumer>
<entityField>
<name>sendNotificationAsMail</name>
<title>root.Usersettings_entity.sendNotificationAsMail.title</title>
......@@ -137,6 +94,9 @@
<entityFieldExtensionPoint>
<name>Settings_FieldExtensionPoint</name>
</entityFieldExtensionPoint>
<entityConsumerExtensionPoint>
<name>Usersettings_ConsumerExtensionPoint</name>
</entityConsumerExtensionPoint>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
......@@ -171,15 +131,6 @@
<jDitoRecordFieldMapping>
<name>UID.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>userCurrency.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>incomingCallContext.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>prefferredApprover.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>sendNotificationAsMail.value</name>
</jDitoRecordFieldMapping>
......
entity/Usersettings_entity/entityfields/incomingcallcontext/displayValueProcess.js deleted 100644 → 0
+ 0
− 5
View file @ d069019a
import { result, vars } from "@aditosoftware/jdito-types";
import { KeywordUtils } from "Keyword_lib";
import { $KeywordRegistry } from "KeywordRegistry_basic";
result.string(KeywordUtils.getViewValue($KeywordRegistry.incomingCallContext(), vars.get("$field.incomingCallContext")));
\ No newline at end of file
entity/Usersettings_entity/entityfields/keywordincomingcallcontext_consumer/children/containername_param/valueProcess.js deleted 100644 → 0
+ 0
− 4
View file @ d069019a
import { result } from "@aditosoftware/jdito-types";
import { $KeywordRegistry } from "KeywordRegistry_basic";
result.string($KeywordRegistry.incomingCallContext());
\ No newline at end of file
entity/Usersettings_entity/entityfields/prefferredapprover/displayValueProcess.js deleted 100644 → 0
+ 0
− 17
View file @ d069019a
import { result, vars } from "@aditosoftware/jdito-types";
import { Contact, ContactTitleRenderer } from "Contact_lib";
import { newSelect } from "SqlBuilder_lib";
var contactId = vars.get("$field.prefferredApprover");
if(contactId)
{
var contact = new Contact();
[contact.salutation, contact.title, contact.firstname, contact.middlename, contact.lastname]
= newSelect("PERSON.SALUTATION, PERSON.TITLE, PERSON.FIRSTNAME, PERSON.MIDDLENAME, PERSON.LASTNAME", "Data_alias")
.from("CONTACT")
.leftJoin("PERSON", "PERSON.PERSONID = CONTACT.PERSON_ID")
.whereIfSet("CONTACT.CONTACTID", contactId)
.arrayRow(true);
result.string(new ContactTitleRenderer(contact, ContactTitleRenderer.OPTIONS.NoOption)
.asString());
}
entity/Usersettings_entity/entityfields/prefferredapprover/documentation.adoc deleted 100644 → 0
+ 0
− 11
View file @ d069019a
== Preffered approver
this will be used as the default value for "Approver" when the user try to start a Approval Workflow (with Person option).
For example for Service ticket
== used for:
"Approval" workflows with _person
and a start view from WorkflowApprove context. For example "WorkflowApproveStartWithApprover_view"
== STATE property
per default is this field "invisible"
entity/Usersettings_entity/entityfields/usercurrency/displayValueProcess.js deleted 100644 → 0
+ 0
− 7
View file @ d069019a
import { result, vars } from "@aditosoftware/jdito-types";
import { CurrencyUtils } from "Currency_lib";
var currencyIso = vars.get("$field.userCurrency");
var title = CurrencyUtils.getTranslatedNameForAlpha3(currencyIso);
result.string(title + " (" + currencyIso + ")");
\ No newline at end of file
entity/Usersettings_entity/entityfields/usercurrency/dropDownProcess.js deleted 100644 → 0
+ 0
− 28
View file @ d069019a
import { entities, result } from "@aditosoftware/jdito-types";
import { CurrencyUtils } from "Currency_lib";
import { SqlBuilder } from "SqlBuilder_lib";
//dropDownProcess isntead of consumer so we can add the local currency
var currenciesWithRateSet = new SqlBuilder("Data_alias")
.selectDistinct("CURRENCYRATE.SOURCECURRENCYISO")
.from("CURRENCYRATE")
.arrayColumn();
currenciesWithRateSet.unshift(CurrencyUtils.getLocalCurrency());//add local Currency
var loadingConfig = entities.createConfigForLoadingRows()
.fields(["ALPHA3", "#CONTENTTITLE"])
.entity("Currency_entity")
.provider("Currencies")
.addParameter("DisplayLongTitle_param", true)
.addParameter("InvertBlacklist_param", true)
.addParameter("Blacklist_param", JSON.stringify(currenciesWithRateSet));
var currencies = entities.getRows(loadingConfig);
var res = [];
for (var currency in currencies)
{
res.push([currencies[currency]["ALPHA3"], currencies[currency]["#CONTENTTITLE"]]);
}
result.object(res);
\ No newline at end of file
neonDashboard/Home/Home.aod deleted 100644 → 0
+ 0
− 63
View file @ d069019a
<?xml version="1.0" encoding="UTF-8"?>
<neonDashboard xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonDashboard/1.2.0">
<name>Home</name>
<title>My Dashboard</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<icon>VAADIN:HOME</icon>
<dashboardType>PRIVATE</dashboardType>
<editRoles />
<defaultDashlets>
<neonDashlet>
<name>InformationDashlet</name>
<viewName>MyDashboardScoreCard_view</viewName>
<configName>Information</configName>
<uiConfiguration>
<name>uiConfiguration</name>
<xPos v="0" />
<yPos v="0" />
<colspan v="1" />
<rowspan v="4" />
</uiConfiguration>
</neonDashlet>
<neonDashlet>
<name>HandelsblattTwitterDashlet</name>
<viewName>TwitterTimeline_view</viewName>
<configName>HandelsblattTwitterConfig</configName>
<uiConfiguration>
<name>uiConfiguration</name>
<xPos v="2" />
<rowspan v="8" />
</uiConfiguration>
</neonDashlet>
<neonDashlet>
<name>MailDropzoneDashlet</name>
<viewName>UniversalFileProcessorDropzone_view</viewName>
<configName>MailDropzone</configName>
<uiConfiguration>
<name>uiConfiguration</name>
<xPos v="1" />
<yPos v="0" />
<rowspan v="8" />
</uiConfiguration>
</neonDashlet>
<neonDashlet>
<name>MyResponsibleOrgsDashlet</name>
<viewName>OrganisationFilter_view</viewName>
<configName>MyResponsibleOrgsConfig</configName>
<uiConfiguration>
<name>uiConfiguration</name>
<yPos v="8" />
<colspan v="3" />
</uiConfiguration>
</neonDashlet>
<neonDashlet>
<name>mytasksDashlet</name>
<viewName>TaskFilter_view</viewName>
<configName>mytasks</configName>
<uiConfiguration>
<name>uiConfiguration</name>
<yPos v="4" />
</uiConfiguration>
</neonDashlet>
</defaultDashlets>
</neonDashboard>
neonView/UsersettingsEdit_view/UsersettingsEdit_view.aod
+ 0
− 16
View file @ 1bd5f469
......@@ -42,16 +42,6 @@
<hideLabels v="false" />
<hideEmptyFields v="false" />
<title>root.UsersettingsEdit_view.CurrencyEdit.title</title>
<fields>
<entityFieldLink>
<name>06e4af54-9604-4139-9be1-ba7a7025d231</name>
<entityField>userCurrency</entityField>
</entityFieldLink>
<entityFieldLink>
<name>ce460e64-dc1e-4951-b590-c3834e35393f</name>
<entityField>prefferredApprover</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
<genericViewTemplate>
<name>PhoneEdit</name>
......@@ -60,12 +50,6 @@
<drawerCaption>root.UsersettingsEdit_view.PhoneEdit.drawerCaption</drawerCaption>
<fixedDrawer v="true" />
<hideEmptyFields v="false" />
<fields>
<entityFieldLink>
<name>370fdbc1-b6b8-4288-a954-d9c7f8aebe35</name>
<entityField>incomingCallContext</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
<genericViewTemplate>
<name>Notification</name>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment