Merge branch 'master' of gitlab.adito.de:xrm/basic

entity/Org_entity/Org_entity.aod

@@ -3,6 +3,7 @@
   <name>Org_entity</name>
   <title>Company</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/Org_entity/documentation.adoc</documentation>
   <iconId>VAADIN:BUILDING</iconId>
   <imageProcess>%aditoprj%/entity/Org_entity/imageProcess.js</imageProcess>
   <titleProcess>%aditoprj%/entity/Org_entity/titleProcess.js</titleProcess>
@@ -331,6 +332,7 @@
     <entityActionField>
       <name>openEditDefaultsView</name>
       <fieldType>ACTION</fieldType>
+      <documentation>%aditoprj%/entity/Org_entity/entityfields/openeditdefaultsview/documentation.adoc</documentation>
       <title>Edit defaults</title>
       <onActionProcess>%aditoprj%/entity/Org_entity/entityfields/openeditdefaultsview/onActionProcess.js</onActionProcess>
       <iconId>NEON:WRENCH</iconId>
@@ -338,6 +340,7 @@
     <entityActionField>
       <name>newOffer</name>
       <fieldType>ACTION</fieldType>
+      <documentation>%aditoprj%/entity/Org_entity/entityfields/newoffer/documentation.adoc</documentation>
       <title>New offer</title>
       <onActionProcess>%aditoprj%/entity/Org_entity/entityfields/newoffer/onActionProcess.js</onActionProcess>
       <iconId>VAADIN:CART</iconId>

entity/Org_entity/documentation.adoc

+An entity for handling organisations (companies).
+
+Besides storing the main data of a company, standard values can be set:
+
+* setting the standard postal address (field directly connected to the db record container)
+* setting standard comm enties (e.g. standard phone or standard email); this is done by performing additional actions onUpdate

entity/Org_entity/entityfields/newoffer/documentation.adoc

+Opens a new OFFER-entry with the current ORG as preset.
\ No newline at end of file

entity/Org_entity/entityfields/openeditdefaultsview/documentation.adoc

+This action opens a view where standard values can be changed for a ORG. 
+For example, this could be a standard mail-address (COMM entries) or the standard (postal) address.

entity/Pers_entity/Pers_entity.aod

@@ -144,10 +144,17 @@
         </entityDependency>
       </dependencies>
     </entityIncomingField>
+    <entityField>
+      <name>PERS_ID</name>
+      <documentation>%aditoprj%/entity/Pers_entity/entityfields/pers_id/documentation.adoc</documentation>
+      <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/pers_id/valueProcess.js</valueProcess>
+    </entityField>
     <entityField>
       <name>ORG_ID</name>
       <title>Firma</title>
       <linkedContext>Org_context</linkedContext>
+      <mandatory v="true" />
       <outgoingField>PersOrg_dfo</outgoingField>
       <searchable v="false" />
       <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/org_id/valueProcess.js</valueProcess>
@@ -520,6 +527,10 @@
           <name>LANGUAGE.value</name>
           <recordfield>RELATION.LANGUAGE</recordfield>
         </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PERS_ID.value</name>
+          <recordfield>RELATION.PERS_ID</recordfield>
+        </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>LASTNAME.value</name>
           <recordfield>PERS.LASTNAME</recordfield>

entity/Pers_entity/entityfields/org_id/onValueChange.js

+import("system.neon");
+import("system.vars");
+
+if(vars.exists("$local.value") && !vars.get("$local.value"))
+{
+    neon.setFieldValue("$field.ORG_ID", "0");
+}

entity/Pers_entity/entityfields/pers_id/documentation.adoc

+The main reason why this field is needed is that the `RELATION.PERS_ID` has to be set when a new record is inserted (to keep references correct).
\ No newline at end of file

entity/Pers_entity/entityfields/pers_id/valueProcess.js

+import("system.vars");
+import("system.result");
+//this is needed to set the RELATION-value when a new record is inserted
+result.string(vars.getString("$field.PERSID"));
\ No newline at end of file

neonContext/Salesproject_context/documentation.adoc

 Salesproject
 ============
+
 == Overview ==
+
 A salesproject consists of some modules:
+
 - Salesproject itself
 - Activity (former History)
 - Milestones

neonView/ActivityMain_view/ActivityMain_view.aod

@@ -19,5 +19,10 @@
       <entityField>#ENTITY</entityField>
       <view>ActivityDetail_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>7bab8dbf-b69e-412d-a604-3a6999658e10</name>
+      <entityField>ActivityDocument_dfo</entityField>
+      <view>DocumentFilter_view</view>
+    </neonViewReference>
   </children>
 </neonView>

neonView/ActivityPreview_view/ActivityPreview_view.aod

@@ -34,5 +34,10 @@
         </entityFieldLink>
       </fields>
     </genericViewTemplate>
+    <neonViewReference>
+      <name>43167618-e4dc-429b-a264-3ea95bd647f9</name>
+      <entityField>ActivityMainDocument_dfo</entityField>
+      <view>DocumentList_view</view>
+    </neonViewReference>
   </children>
 </neonView>

neonView/DocumentList_view/DocumentList_view.aod

@@ -14,7 +14,7 @@
       <titleField>NAME</titleField>
       <descriptionField>DESCRIPTION</descriptionField>
       <iconField>ICON</iconField>
-      <entryAction>downloadEntryAction</entryAction>
+      <entryAction>downloadFilesAction</entryAction>
       <entityField>#ENTITY</entityField>
     </actionListViewTemplate>
   </children>

others/db_changes/struct/create_pers.xml

@@ -6,10 +6,14 @@
 			<constraints primaryKey="true" primaryKeyName="PK_PERS_PERSID"/>
 		</column>
 		<column name="DATE_EDIT" type="TIMESTAMP"/>
-		<column name="DATE_NEW" type="TIMESTAMP"/>
+		<column name="DATE_NEW" type="TIMESTAMP">
+                    <constraints nullable="false"/>
+                </column>
 		<column name="DATEOFBIRTH" type="DATE"/>
 		<column name="USER_EDIT" type="NVARCHAR(50)"/>
-		<column name="USER_NEW" type="NVARCHAR(50)"/>
+		<column name="USER_NEW" type="NVARCHAR(50)">
+                    <constraints nullable="false"/>
+                </column>
 		<column name="FIRSTNAME" type="NVARCHAR(50)"/>
 		<column name="MIDDLENAME" type="NVARCHAR(50)"/>
 		<column name="LASTNAME" type="NVARCHAR(50)">

others/guide/how to write JDito code.adoc

@@ -147,7 +147,7 @@ Add @ignore to the comment of the private functions.
 == JS-Doc ==
 
 <1> JS-Doc comment: http://usejsdoc.org/
-<2> jsdoc-blocks have to start with /** because the tool to generate docs out of jsdoc only works with /**
+<2> jsdoc-blocks have to start with /&#x002A;&#x002A; because the tool to generate docs out of jsdoc only works with /&#x002A;&#x002A;
 <3> use the correct form for optional/required parameters: http://usejsdoc.org/tags-param.html
 Optional parameter: [alias=the current alias]
 Required parameter: alias
@@ -170,7 +170,7 @@ function SqlCondition(pAlias)
 <3> examples are useful on more complex functions
 <4> constructor function; init properties (do not set functions ("methods") here!)
 <5> add functions ("methods") to the prototype, they are available through the prototype chain
-<6> the comments have to start with /** not /* otherwise JSDoc cannot generate a documentation
+<6> the comments have to start with /&#x002A;&#x002A; not /&#x002A; otherwise JSDoc cannot generate a documentation
 
 And how to use it (normally you'd want to use preparedStatements but for the sake of an easy example it's a bit shorter here)
 See also HowToSqlConditionLib.adoc for a full documentation.

system/default/default.aod

@@ -6,5 +6,6 @@
   <aditoHomePath>$ADITOHOME</aditoHomePath>
   <aditoDataPath>$PROJECTHOME/data</aditoDataPath>
   <loginUser>admin</loginUser>
+  <autoLogin v="false" />
   <enableJDitoDebug v="true" />
 </system>