|
@@ -59,6 +59,7 @@ CLASS addresses.addressprogsHandler FINAL:
|
|
|
DEFINE VARIABLE lcMessage AS LONGCHAR NO-UNDO.
|
|
DEFINE VARIABLE lcMessage AS LONGCHAR NO-UNDO.
|
|
|
DEFINE VARIABLE lcString AS LONGCHAR NO-UNDO.
|
|
DEFINE VARIABLE lcString AS LONGCHAR NO-UNDO.
|
|
|
DEFINE VARIABLE iAddress_Id AS INT64 NO-UNDO.
|
|
DEFINE VARIABLE iAddress_Id AS INT64 NO-UNDO.
|
|
|
|
|
+ DEFINE VARIABLE hError AS HANDLE NO-UNDO.
|
|
|
|
|
|
|
|
DEFINE VARIABLE cWhere AS CHARACTER NO-UNDO.
|
|
DEFINE VARIABLE cWhere AS CHARACTER NO-UNDO.
|
|
|
DEFINE VARIABLE cUniqueWhere AS CHARACTER NO-UNDO.
|
|
DEFINE VARIABLE cUniqueWhere AS CHARACTER NO-UNDO.
|
|
@@ -124,8 +125,6 @@ CLASS addresses.addressprogsHandler FINAL:
|
|
|
DEFINE VARIABLE outilitiesHandler AS utilitiesHandler NO-UNDO.
|
|
DEFINE VARIABLE outilitiesHandler AS utilitiesHandler NO-UNDO.
|
|
|
DEFINE VARIABLE oselectboxHandler AS selectboxHandler NO-UNDO.
|
|
DEFINE VARIABLE oselectboxHandler AS selectboxHandler NO-UNDO.
|
|
|
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
/*------------------------------------------------------------------------------
|
|
/*------------------------------------------------------------------------------
|
|
|
Purpose:
|
|
Purpose:
|
|
|
Notes:
|
|
Notes:
|
|
@@ -134,9 +133,10 @@ CLASS addresses.addressprogsHandler FINAL:
|
|
|
CONSTRUCTOR PUBLIC addressprogsHandler ( ):
|
|
CONSTRUCTOR PUBLIC addressprogsHandler ( ):
|
|
|
SUPER ().
|
|
SUPER ().
|
|
|
|
|
|
|
|
|
|
+ hError = ERROR-STATUS:HANDLE.
|
|
|
|
|
+
|
|
|
END CONSTRUCTOR.
|
|
END CONSTRUCTOR.
|
|
|
|
|
|
|
|
-
|
|
|
|
|
/*------------------------------------------------------------------------------
|
|
/*------------------------------------------------------------------------------
|
|
|
Purpose:
|
|
Purpose:
|
|
|
Notes:
|
|
Notes:
|
|
@@ -151,6 +151,8 @@ CLASS addresses.addressprogsHandler FINAL:
|
|
|
DEFINE VARIABLE iItemsPage AS INTEGER NO-UNDO.
|
|
DEFINE VARIABLE iItemsPage AS INTEGER NO-UNDO.
|
|
|
DEFINE VARIABLE cMaxHeight AS CHARACTER NO-UNDO.
|
|
DEFINE VARIABLE cMaxHeight AS CHARACTER NO-UNDO.
|
|
|
|
|
|
|
|
|
|
+ hError = ERROR-STATUS:HANDLE.
|
|
|
|
|
+
|
|
|
outilitiesHandler = NEW utilitiesHandler().
|
|
outilitiesHandler = NEW utilitiesHandler().
|
|
|
oselectboxHandler = NEW selectboxHandler().
|
|
oselectboxHandler = NEW selectboxHandler().
|
|
|
|
|
|
|
@@ -311,9 +313,15 @@ CLASS addresses.addressprogsHandler FINAL:
|
|
|
IF cDirection BEGINS 'asc' THEN cDirection = ''.
|
|
IF cDirection BEGINS 'asc' THEN cDirection = ''.
|
|
|
cWhere = cWhere + SUBSTITUTE(' BY &1 &2', cSortField, cDirection).
|
|
cWhere = cWhere + SUBSTITUTE(' BY &1 &2', cSortField, cDirection).
|
|
|
END.
|
|
END.
|
|
|
-// MESSAGE 'cWhere am Ende von BuildWhere ' cWhere.
|
|
|
|
|
|
|
+// MESSAGE 'cWhere am Ende von BuildWhere =' cWhere.
|
|
|
|
|
+ outilitiesHandler:writeLastcWhere(
|
|
|
|
|
+ INPUT oJsonIdent ,
|
|
|
|
|
+ INPUT cFileName ,
|
|
|
|
|
+ INPUT cWhere
|
|
|
|
|
+ ).
|
|
|
|
|
+
|
|
|
createTempTable().
|
|
createTempTable().
|
|
|
-// MESSAGE 'WHERE-Statement nach buildcWhere =' cWhere.
|
|
|
|
|
|
|
+
|
|
|
RETURN.
|
|
RETURN.
|
|
|
|
|
|
|
|
END METHOD.
|
|
END METHOD.
|
|
@@ -327,63 +335,43 @@ CLASS addresses.addressprogsHandler FINAL:
|
|
|
INPUT oJsonData AS JsonObject ,
|
|
INPUT oJsonData AS JsonObject ,
|
|
|
OUTPUT oJsonReturn AS JsonObject
|
|
OUTPUT oJsonReturn AS JsonObject
|
|
|
):
|
|
):
|
|
|
-
|
|
|
|
|
- DEFINE VARIABLE cReplace AS CHARACTER NO-UNDO.
|
|
|
|
|
- DEFINE VARIABLE cFieldName AS CHARACTER NO-UNDO.
|
|
|
|
|
- DEFINE VARIABLE cField AS CHARACTER NO-UNDO.
|
|
|
|
|
- DEFINE VARIABLE cBufferField AS CHARACTER NO-UNDO.
|
|
|
|
|
- DEFINE VARIABLE cValue AS CHARACTER NO-UNDO.
|
|
|
|
|
- DEFINE VARIABLE ii AS INTEGER NO-UNDO.
|
|
|
|
|
- DEFINE VARIABLE lOK AS LOGICAL NO-UNDO.
|
|
|
|
|
- DEFINE VARIABLE cCompany AS CHARACTER NO-UNDO.
|
|
|
|
|
- DEFINE VARIABLE cFormUser AS CHARACTER NO-UNDO.
|
|
|
|
|
-
|
|
|
|
|
- DEFINE VARIABLE hField AS HANDLE NO-UNDO.
|
|
|
|
|
- DEFINE VARIABLE cAdresse AS CHARACTER NO-UNDO EXTENT 12.
|
|
|
|
|
- DEFINE VARIABLE cBriefanrede AS CHARACTER NO-UNDO.
|
|
|
|
|
-
|
|
|
|
|
|
|
+// MESSAGE 'START changeAnschrift'.
|
|
|
|
|
+ DEFINE VARIABLE oJsonMessage AS JsonObject NO-UNDO.
|
|
|
|
|
+ DEFINE VARIABLE oJsonMessageBox AS JsonObject NO-UNDO.
|
|
|
DEFINE VARIABLE oJsonRecord AS JsonObject NO-UNDO.
|
|
DEFINE VARIABLE oJsonRecord AS JsonObject NO-UNDO.
|
|
|
- DEFINE VARIABLE oJsonArray AS JsonArray NO-UNDO.
|
|
|
|
|
|
|
+ DEFINE VARIABLE oMasterKeyFields AS JsonObject NO-UNDO.
|
|
|
DEFINE VARIABLE oJsonSelectBoxes AS JsonObject NO-UNDO.
|
|
DEFINE VARIABLE oJsonSelectBoxes AS JsonObject NO-UNDO.
|
|
|
|
|
+
|
|
|
|
|
+ DEFINE VARIABLE lRetVal AS LOGICAL NO-UNDO.
|
|
|
|
|
+ DEFINE VARIABLE lOK AS LOGICAL NO-UNDO.
|
|
|
|
|
+ DEFINE VARIABLE hField AS HANDLE NO-UNDO.
|
|
|
|
|
+ DEFINE VARIABLE htField AS HANDLE NO-UNDO.
|
|
|
|
|
+ DEFINE VARIABLE rBuffer AS RECID NO-UNDO.
|
|
|
|
|
+ DEFINE VARIABLE iContact_Id AS INTEGER NO-UNDO.
|
|
|
|
|
|
|
|
- httKeyFields = TEMP-TABLE ttKeyFields :DEFAULT-BUFFER-HANDLE.
|
|
|
|
|
- httPrimaryIndex = TEMP-TABLE ttPrimaryIndex:DEFAULT-BUFFER-HANDLE.
|
|
|
|
|
- //
|
|
|
|
|
- // Ermitteln des Tabellennamens, ob die Tabelle das Feld "company" und/oder das Feld "active" enthält
|
|
|
|
|
- //
|
|
|
|
|
- outilitiesHandler:evaluateFile(
|
|
|
|
|
- INPUT-OUTPUT oJsonIdent ,
|
|
|
|
|
- OUTPUT cFileName ,
|
|
|
|
|
- OUTPUT lCompany ,
|
|
|
|
|
- OUTPUT lActive ,
|
|
|
|
|
- OUTPUT lWordIndex ,
|
|
|
|
|
- INPUT-OUTPUT httKeyFields ,
|
|
|
|
|
- INPUT-OUTPUT httPrimaryIndex
|
|
|
|
|
- ).
|
|
|
|
|
-
|
|
|
|
|
- cFunction = oJsonIdent:GetCharacter('function').
|
|
|
|
|
- cCompany = oJsonIdent:GetCharacter('company').
|
|
|
|
|
- cFormId = oJsonIdent:GetCharacter('formId').
|
|
|
|
|
- cFormUser = oJsonIdent:GetCharacter('formUser').
|
|
|
|
|
-
|
|
|
|
|
-// CREATE BUFFER hBuffer FOR TABLE cFileName.
|
|
|
|
|
-// createTempTable().
|
|
|
|
|
|
|
+ DEFINE VARIABLE lcttTable AS LONGCHAR NO-UNDO.
|
|
|
|
|
|
|
|
oJsonRecord = NEW JsonObject().
|
|
oJsonRecord = NEW JsonObject().
|
|
|
- oJsonRecord = oJsonData:GetJsonObject('record').
|
|
|
|
|
-// oJsonRecord:WriteFile('C:\Temp\changeanschrift_oJsonRecord.json', TRUE).
|
|
|
|
|
|
|
+ oJsonRecord = oJsonData:GetJsonObject('record') NO-ERROR.
|
|
|
|
|
+// oJsonRecord:WriteFile('C:\TEMP\createAnschrift_record.json', TRUE).
|
|
|
|
|
+ oMasterKeyFields = NEW JsonObject().
|
|
|
|
|
+ oMasterKeyFields = oJsonData:GetJsonObject('masterKeyFields') NO-ERROR.
|
|
|
|
|
+ //
|
|
|
|
|
+ // Input-Recors-Daten in ttTable lesen
|
|
|
|
|
+ //
|
|
|
|
|
+ createTempTable().
|
|
|
|
|
+ oJsonRecord:Write(lcttTable, FALSE).
|
|
|
|
|
|
|
|
- httTable:READ-JSON('JsonObject', oJsonRecord) NO-ERROR.
|
|
|
|
|
- outilitiesHandler:evaluateErrorStatus(ERROR-STATUS:HANDLE).
|
|
|
|
|
-
|
|
|
|
|
-// httTable:WRITE-JSON ('FILE', 'C:\TEMP\ttTable_changeAnschrift_Inhalt.json', TRUE).
|
|
|
|
|
|
|
+ lOK = ttTable:READ-JSON('longchar', lcttTable, 'EMPTY') NO-ERROR.
|
|
|
|
|
+ outilitiesHandler:evaluateErrorStatus(hError).
|
|
|
//
|
|
//
|
|
|
// den ersten Datensatz in der TEMP-TABLE lesen
|
|
// den ersten Datensatz in der TEMP-TABLE lesen
|
|
|
//
|
|
//
|
|
|
- httTable:FIND-FIRST('', NO-LOCK) NO-ERROR.
|
|
|
|
|
- outilitiesHandler:evaluateErrorStatus(ERROR-STATUS:HANDLE).
|
|
|
|
|
-
|
|
|
|
|
- IF iformTabIndex = 1 AND
|
|
|
|
|
|
|
+ httTable:FIND-FIRST('', NO-LOCK).
|
|
|
|
|
+// httTable:WRITE-JSON ('FILE', 'C:\TEMP\ttTable_changeAnschrift_Inhalt.json', TRUE).
|
|
|
|
|
+ IF oJsonIdent:HAS('formTabIndex') THEN iFormTabIndex = INTEGER(oJsonIdent:GetJsonText('formTabIndex')).
|
|
|
|
|
+// MESSAGE iFormTabIndex '-' cFileName '-' httTable::address_fix '-' httTable::first_name.
|
|
|
|
|
+ IF iFormTabIndex = 1 AND
|
|
|
cFileName = 'addresses' AND
|
|
cFileName = 'addresses' AND
|
|
|
NOT httTable::address_fix THEN
|
|
NOT httTable::address_fix THEN
|
|
|
DO:
|
|
DO:
|
|
@@ -457,7 +445,7 @@ CLASS addresses.addressprogsHandler FINAL:
|
|
|
// oJsonRecord:WriteFile('C:\Temp\changefixedAddressoJsonRecord.json', TRUE).
|
|
// oJsonRecord:WriteFile('C:\Temp\changefixedAddressoJsonRecord.json', TRUE).
|
|
|
|
|
|
|
|
httTable:READ-JSON('JsonObject', oJsonRecord) NO-ERROR.
|
|
httTable:READ-JSON('JsonObject', oJsonRecord) NO-ERROR.
|
|
|
- outilitiesHandler:evaluateErrorStatus(ERROR-STATUS:HANDLE).
|
|
|
|
|
|
|
+ outilitiesHandler:evaluateErrorStatus(hError).
|
|
|
|
|
|
|
|
// httTable:WRITE-JSON ('FILE', 'C:\TEMP\ttTable_changeFixedAddresses_Inhalt.json', TRUE).
|
|
// httTable:WRITE-JSON ('FILE', 'C:\TEMP\ttTable_changeFixedAddresses_Inhalt.json', TRUE).
|
|
|
httTable:FIND-FIRST('', NO-LOCK) NO-ERROR.
|
|
httTable:FIND-FIRST('', NO-LOCK) NO-ERROR.
|
|
@@ -505,7 +493,7 @@ CLASS addresses.addressprogsHandler FINAL:
|
|
|
DEFINE VARIABLE hField AS HANDLE NO-UNDO.
|
|
DEFINE VARIABLE hField AS HANDLE NO-UNDO.
|
|
|
|
|
|
|
|
IF hRecord::address_fix THEN RETURN.
|
|
IF hRecord::address_fix THEN RETURN.
|
|
|
- MESSAGE 'start'.
|
|
|
|
|
|
|
+// MESSAGE 'start'.
|
|
|
iLanguage_id = hRecord::language_id.
|
|
iLanguage_id = hRecord::language_id.
|
|
|
iSalutationCode = hRecord::salutation_code.
|
|
iSalutationCode = hRecord::salutation_code.
|
|
|
cCountryCode = hRecord::country_code.
|
|
cCountryCode = hRecord::country_code.
|
|
@@ -659,7 +647,7 @@ CLASS addresses.addressprogsHandler FINAL:
|
|
|
oJsonRecord:Write(lcttTable, FALSE).
|
|
oJsonRecord:Write(lcttTable, FALSE).
|
|
|
// MESSAGE STRING(lcttTable).
|
|
// MESSAGE STRING(lcttTable).
|
|
|
lOK = ttTable:READ-JSON('longchar', lcttTable, 'EMPTY') NO-ERROR.
|
|
lOK = ttTable:READ-JSON('longchar', lcttTable, 'EMPTY') NO-ERROR.
|
|
|
- outilitiesHandler:evaluateErrorStatus(ERROR-STATUS:HANDLE).
|
|
|
|
|
|
|
+ outilitiesHandler:evaluateErrorStatus(hError).
|
|
|
httTable:FIND-FIRST('', NO-LOCK).
|
|
httTable:FIND-FIRST('', NO-LOCK).
|
|
|
|
|
|
|
|
/* EXTENT(cFieldNames) = ?. */
|
|
/* EXTENT(cFieldNames) = ?. */
|
|
@@ -694,7 +682,7 @@ CLASS addresses.addressprogsHandler FINAL:
|
|
|
/* oJsonRecord:SET(cField, cValue). */
|
|
/* oJsonRecord:SET(cField, cValue). */
|
|
|
/* END. */
|
|
/* END. */
|
|
|
/* END CASE. */
|
|
/* END CASE. */
|
|
|
- /* lOk = outilitiesHandler:evaluateErrorStatus(ERROR-STATUS:HANDLE). */
|
|
|
|
|
|
|
+ /* lOk = outilitiesHandler:evaluateErrorStatus(hError). */
|
|
|
/* END. */
|
|
/* END. */
|
|
|
IF lCompany THEN
|
|
IF lCompany THEN
|
|
|
DO:
|
|
DO:
|
|
@@ -787,9 +775,7 @@ CLASS addresses.addressprogsHandler FINAL:
|
|
|
|
|
|
|
|
DEFINE VARIABLE lRetVal AS LOGICAL NO-UNDO.
|
|
DEFINE VARIABLE lRetVal AS LOGICAL NO-UNDO.
|
|
|
DEFINE VARIABLE lOK AS LOGICAL NO-UNDO.
|
|
DEFINE VARIABLE lOK AS LOGICAL NO-UNDO.
|
|
|
- DEFINE VARIABLE ii AS INTEGER NO-UNDO.
|
|
|
|
|
- DEFINE VARIABLE i1 AS INTEGER NO-UNDO.
|
|
|
|
|
- DEFINE VARIABLE i2 AS INTEGER NO-UNDO.
|
|
|
|
|
|
|
+ DEFINE VARIABLE iAnzRec AS INTEGER NO-UNDO.
|
|
|
DEFINE VARIABLE hField AS HANDLE NO-UNDO.
|
|
DEFINE VARIABLE hField AS HANDLE NO-UNDO.
|
|
|
DEFINE VARIABLE htField AS HANDLE NO-UNDO.
|
|
DEFINE VARIABLE htField AS HANDLE NO-UNDO.
|
|
|
DEFINE VARIABLE hUniqueBuffer AS HANDLE NO-UNDO.
|
|
DEFINE VARIABLE hUniqueBuffer AS HANDLE NO-UNDO.
|
|
@@ -812,12 +798,11 @@ CLASS addresses.addressprogsHandler FINAL:
|
|
|
oJsonRecord:Write(lcttTable, FALSE).
|
|
oJsonRecord:Write(lcttTable, FALSE).
|
|
|
// MESSAGE STRING(lcttTable).
|
|
// MESSAGE STRING(lcttTable).
|
|
|
lOK = ttTable:READ-JSON('longchar', lcttTable, 'EMPTY') NO-ERROR.
|
|
lOK = ttTable:READ-JSON('longchar', lcttTable, 'EMPTY') NO-ERROR.
|
|
|
- outilitiesHandler:evaluateErrorStatus(ERROR-STATUS:HANDLE).
|
|
|
|
|
|
|
+ outilitiesHandler:evaluateErrorStatus(hError).
|
|
|
httTable:FIND-FIRST('', NO-LOCK).
|
|
httTable:FIND-FIRST('', NO-LOCK).
|
|
|
//
|
|
//
|
|
|
// Anschrift und Briefanrede erstellen
|
|
// Anschrift und Briefanrede erstellen
|
|
|
//
|
|
//
|
|
|
-// MESSAGE 'd'.
|
|
|
|
|
iFormTabIndex = htt::FormTabIndex.
|
|
iFormTabIndex = htt::FormTabIndex.
|
|
|
IF iFormTabIndex = 1 AND
|
|
IF iFormTabIndex = 1 AND
|
|
|
cFileName = 'addresses' AND
|
|
cFileName = 'addresses' AND
|
|
@@ -850,7 +835,9 @@ CLASS addresses.addressprogsHandler FINAL:
|
|
|
lRetVal = FALSE.
|
|
lRetVal = FALSE.
|
|
|
REPEAT TRANSACTION ON ERROR UNDO, LEAVE:
|
|
REPEAT TRANSACTION ON ERROR UNDO, LEAVE:
|
|
|
lOK = hBuffer:FIND-UNIQUE(cUniqueWhere, NO-LOCK) NO-ERROR.
|
|
lOK = hBuffer:FIND-UNIQUE(cUniqueWhere, NO-LOCK) NO-ERROR.
|
|
|
- MESSAGE 'find unique mit ' lOK 'und' cUniqueWhere.
|
|
|
|
|
|
|
+ //
|
|
|
|
|
+ // Wenn gefunden, dann Fehler weil doppelte ID
|
|
|
|
|
+ //
|
|
|
IF lOK THEN
|
|
IF lOK THEN
|
|
|
DO:
|
|
DO:
|
|
|
outilitiesHandler:createErrorBox(
|
|
outilitiesHandler:createErrorBox(
|
|
@@ -876,52 +863,6 @@ CLASS addresses.addressprogsHandler FINAL:
|
|
|
//
|
|
//
|
|
|
hBuffer:BUFFER-CREATE().
|
|
hBuffer:BUFFER-CREATE().
|
|
|
hBuffer:BUFFER-COPY(httTable) NO-ERROR.
|
|
hBuffer:BUFFER-COPY(httTable) NO-ERROR.
|
|
|
- /* DO ii = 1 TO httTable:NUM-FIELDS: */
|
|
|
|
|
- /* htField = httTable:BUFFER-FIELD(ii):HANDLE NO-ERROR. */
|
|
|
|
|
- /* cField = htField:NAME. */
|
|
|
|
|
- /* hField = hBuffer:BUFFER-FIELD(cField):HANDLE NO-ERROR. */
|
|
|
|
|
- /* IF ERROR-STATUS:ERROR OR */
|
|
|
|
|
- /* NOT VALID-HANDLE(hField) THEN NEXT. */
|
|
|
|
|
- /* */
|
|
|
|
|
- /* IF hField:EXTENT > 0 THEN */
|
|
|
|
|
- /* DO: */
|
|
|
|
|
- /* cFieldValue = htField:BUFFER-VALUE. */
|
|
|
|
|
- /* IF cField = 'address' THEN */
|
|
|
|
|
- /* DO: */
|
|
|
|
|
- /* FIND countries NO-LOCK */
|
|
|
|
|
- /* WHERE countries.language_id = httTable::language_id */
|
|
|
|
|
- /* AND countries.country_code = httTable::country_code NO-ERROR. */
|
|
|
|
|
- /* IF NOT AVAILABLE countries THEN */
|
|
|
|
|
- /* DO: */
|
|
|
|
|
- /* FIND countries NO-LOCK */
|
|
|
|
|
- /* WHERE countries.language_id = 1 */
|
|
|
|
|
- /* AND countries.country_code = httTable::country_code NO-ERROR.*/
|
|
|
|
|
- /* END. */
|
|
|
|
|
- /* i2 = (IF countries.country_code_pos = 9 THEN 12 ELSE 11). */
|
|
|
|
|
- /* */
|
|
|
|
|
- /* DO i1 = 1 TO 12: */
|
|
|
|
|
- /* hField:BUFFER-VALUE(i1) = ''. */
|
|
|
|
|
- /* END. */
|
|
|
|
|
- /* DO i1 = NUM-ENTRIES(cFieldValue, CHR(10)) TO 1 BY -1: */
|
|
|
|
|
- /* cValue = ENTRY(i1, cFieldValue, CHR(10)). */
|
|
|
|
|
- /* IF cValue = '' THEN NEXT. */
|
|
|
|
|
- /* hField:BUFFER-VALUE(i2) = cValue. */
|
|
|
|
|
- /* i2 = i2 - 1. */
|
|
|
|
|
- /* END. */
|
|
|
|
|
- /* END. */
|
|
|
|
|
- /* ELSE */
|
|
|
|
|
- /* DO: */
|
|
|
|
|
- /* DO i1 = 1 TO hField:EXTENT: */
|
|
|
|
|
- /* hField:BUFFER-VALUE(i1) = ENTRY(i1, cFieldValue, CHR(10)) NO-ERROR.*/
|
|
|
|
|
- /* END. */
|
|
|
|
|
- /* END. */
|
|
|
|
|
- /* END. */
|
|
|
|
|
- /* ELSE */
|
|
|
|
|
- /* DO: */
|
|
|
|
|
- /* IF htField:BUFFER-VALUE = hField:BUFFER-VALUE THEN NEXT. */
|
|
|
|
|
- /* hField:BUFFER-VALUE = htField:BUFFER-VALUE. */
|
|
|
|
|
- /* END. */
|
|
|
|
|
- /* END. */
|
|
|
|
|
|
|
|
|
|
htField = hBuffer:BUFFER-FIELD('active'):HANDLE NO-ERROR.
|
|
htField = hBuffer:BUFFER-FIELD('active'):HANDLE NO-ERROR.
|
|
|
IF NOT ERROR-STATUS:ERROR AND
|
|
IF NOT ERROR-STATUS:ERROR AND
|
|
@@ -936,8 +877,8 @@ CLASS addresses.addressprogsHandler FINAL:
|
|
|
|
|
|
|
|
rBuffer = hBuffer:RECID.
|
|
rBuffer = hBuffer:RECID.
|
|
|
oJsonIdent:ADD('rBuffer', INT64(rBuffer)) NO-ERROR.
|
|
oJsonIdent:ADD('rBuffer', INT64(rBuffer)) NO-ERROR.
|
|
|
-
|
|
|
|
|
hBuffer:BUFFER-RELEASE ().
|
|
hBuffer:BUFFER-RELEASE ().
|
|
|
|
|
+
|
|
|
outilitiesHandler:writeLastRecord(
|
|
outilitiesHandler:writeLastRecord(
|
|
|
INPUT oJsonIdent ,
|
|
INPUT oJsonIdent ,
|
|
|
INPUT cUniqueWhere
|
|
INPUT cUniqueWhere
|
|
@@ -946,17 +887,17 @@ CLASS addresses.addressprogsHandler FINAL:
|
|
|
lRetVal = TRUE.
|
|
lRetVal = TRUE.
|
|
|
LEAVE.
|
|
LEAVE.
|
|
|
END.
|
|
END.
|
|
|
-
|
|
|
|
|
- IF cFileName = 'addresses' OR
|
|
|
|
|
- cFileName = 'communication' THEN
|
|
|
|
|
- DO:
|
|
|
|
|
- updateCommunication(
|
|
|
|
|
- INPUT iContact_Id
|
|
|
|
|
- ).
|
|
|
|
|
- END.
|
|
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
IF lRetVal THEN
|
|
IF lRetVal THEN
|
|
|
DO:
|
|
DO:
|
|
|
|
|
+ IF cFileName = 'addresses' OR
|
|
|
|
|
+ cFileName = 'communication' THEN
|
|
|
|
|
+ DO:
|
|
|
|
|
+ updateCommunication(
|
|
|
|
|
+ INPUT iContact_Id
|
|
|
|
|
+ ).
|
|
|
|
|
+ END.
|
|
|
|
|
+
|
|
|
fillWordIndexTable().
|
|
fillWordIndexTable().
|
|
|
END.
|
|
END.
|
|
|
//
|
|
//
|
|
@@ -968,24 +909,22 @@ CLASS addresses.addressprogsHandler FINAL:
|
|
|
INPUT cFileName ,
|
|
INPUT cFileName ,
|
|
|
OUTPUT cWhere
|
|
OUTPUT cWhere
|
|
|
).
|
|
).
|
|
|
-
|
|
|
|
|
|
|
+// MESSAGE 'cWhere nach add von Datensatz' cWhere.
|
|
|
outilitiesHandler:evaluatePageNumber(
|
|
outilitiesHandler:evaluatePageNumber(
|
|
|
INPUT-OUTPUT oJsonIdent ,
|
|
INPUT-OUTPUT oJsonIdent ,
|
|
|
INPUT cWhere ,
|
|
INPUT cWhere ,
|
|
|
- INPUT rBuffer
|
|
|
|
|
- ).
|
|
|
|
|
-
|
|
|
|
|
- httTable:EMPTY-TEMP-TABLE ().
|
|
|
|
|
- DELETE OBJECT ttTable.
|
|
|
|
|
|
|
+ INPUT rBuffer ,
|
|
|
|
|
+ INPUT 'current'
|
|
|
|
|
+ ).
|
|
|
|
|
+
|
|
|
createTempTable().
|
|
createTempTable().
|
|
|
-
|
|
|
|
|
- fillTemptableFromTable(
|
|
|
|
|
|
|
+ iAnzRec = fillTemptableFromTable(
|
|
|
OUTPUT oJsonReturn
|
|
OUTPUT oJsonReturn
|
|
|
).
|
|
).
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
CREATE BUFFER hUniqueBuffer FOR TABLE cFileName.
|
|
CREATE BUFFER hUniqueBuffer FOR TABLE cFileName.
|
|
|
hUniqueBuffer:FIND-UNIQUE (cUniqueWhere, NO-LOCK) NO-ERROR.
|
|
hUniqueBuffer:FIND-UNIQUE (cUniqueWhere, NO-LOCK) NO-ERROR.
|
|
|
- outilitiesHandler:evaluateErrorStatus(ERROR-STATUS:HANDLE).
|
|
|
|
|
|
|
+ outilitiesHandler:evaluateErrorStatus(hError).
|
|
|
hField = hUniqueBuffer:BUFFER-FIELD('language_id'):HANDLE NO-ERROR.
|
|
hField = hUniqueBuffer:BUFFER-FIELD('language_id'):HANDLE NO-ERROR.
|
|
|
IF VALID-HANDLE(hField) AND
|
|
IF VALID-HANDLE(hField) AND
|
|
|
NOT ERROR-STATUS:ERROR THEN oJsonIdent:SET('language_id', hField:BUFFER-VALUE).
|
|
NOT ERROR-STATUS:ERROR THEN oJsonIdent:SET('language_id', hField:BUFFER-VALUE).
|
|
@@ -1004,9 +943,7 @@ CLASS addresses.addressprogsHandler FINAL:
|
|
|
|
|
|
|
|
IF lRetVal THEN
|
|
IF lRetVal THEN
|
|
|
DO:
|
|
DO:
|
|
|
- oJsonReturn = NEW JsonObject().
|
|
|
|
|
oJsonReturn:ADD('success', TRUE ).
|
|
oJsonReturn:ADD('success', TRUE ).
|
|
|
- oJsonReturn:ADD('record' , oJsonData).
|
|
|
|
|
|
|
|
|
|
outilitiesHandler:createInfoBox(
|
|
outilitiesHandler:createInfoBox(
|
|
|
INPUT oJsonIdent ,
|
|
INPUT oJsonIdent ,
|
|
@@ -1015,7 +952,7 @@ CLASS addresses.addressprogsHandler FINAL:
|
|
|
OUTPUT oJsonMessageBox
|
|
OUTPUT oJsonMessageBox
|
|
|
) NO-ERROR.
|
|
) NO-ERROR.
|
|
|
oJsonReturn:ADD('showMessage', oJsonMessageBox).
|
|
oJsonReturn:ADD('showMessage', oJsonMessageBox).
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
RETURN TRUE.
|
|
RETURN TRUE.
|
|
|
END.
|
|
END.
|
|
|
|
|
|
|
@@ -1077,6 +1014,7 @@ CLASS addresses.addressprogsHandler FINAL:
|
|
|
WHERE customers.company = ccompany
|
|
WHERE customers.company = ccompany
|
|
|
AND customers.address_id = hUniqueBuffer::address_id NO-ERROR.
|
|
AND customers.address_id = hUniqueBuffer::address_id NO-ERROR.
|
|
|
oInfoRecord:ADD('lcustomer', (IF AVAILABLE customers THEN TRUE ELSE FALSE)).
|
|
oInfoRecord:ADD('lcustomer', (IF AVAILABLE customers THEN TRUE ELSE FALSE)).
|
|
|
|
|
+ oInfoRecord:SET('lcustomer', TRUE).
|
|
|
/* FIND FIRST creditors NO-LOCK */
|
|
/* FIND FIRST creditors NO-LOCK */
|
|
|
/* WHERE creditors.company = ccompany */
|
|
/* WHERE creditors.company = ccompany */
|
|
|
/* AND creditors.address_id = hUniqueBuffer::address_id NO-ERROR. */
|
|
/* AND creditors.address_id = hUniqueBuffer::address_id NO-ERROR. */
|
|
@@ -1109,7 +1047,7 @@ CLASS addresses.addressprogsHandler FINAL:
|
|
|
DEFINE VARIABLE cBoxfields AS CHARACTER NO-UNDO.
|
|
DEFINE VARIABLE cBoxfields AS CHARACTER NO-UNDO.
|
|
|
DEFINE VARIABLE cAddField AS CHARACTER NO-UNDO.
|
|
DEFINE VARIABLE cAddField AS CHARACTER NO-UNDO.
|
|
|
DEFINE VARIABLE cField AS CHARACTER NO-UNDO.
|
|
DEFINE VARIABLE cField AS CHARACTER NO-UNDO.
|
|
|
-MESSAGE cCompany '-' cFormId '-' htt::FormId.
|
|
|
|
|
|
|
+// MESSAGE cCompany '-' cFormId '-' htt::FormId.
|
|
|
FIND FIRST selectboxfields NO-LOCK
|
|
FIND FIRST selectboxfields NO-LOCK
|
|
|
WHERE selectboxfields.company = cCompany
|
|
WHERE selectboxfields.company = cCompany
|
|
|
AND selectboxfields.user_name = 'admin'
|
|
AND selectboxfields.user_name = 'admin'
|
|
@@ -1125,10 +1063,12 @@ MESSAGE cCompany '-' cFormId '-' htt::FormId.
|
|
|
+ selectboxfields.boxfieldsFix.
|
|
+ selectboxfields.boxfieldsFix.
|
|
|
cBoxFields = REPLACE(cBoxfields, ',', ';').
|
|
cBoxFields = REPLACE(cBoxfields, ',', ';').
|
|
|
lBoxFields = TRUE.
|
|
lBoxFields = TRUE.
|
|
|
- MESSAGE 'Alle Boxfields für' cFormId '->' cBoxfields
|
|
|
|
|
- VIEW-AS ALERT-BOX.
|
|
|
|
|
|
|
+// MESSAGE 'Alle Boxfields für' cFormId '->' cBoxfields.
|
|
|
END.
|
|
END.
|
|
|
|
|
|
|
|
|
|
+ IF VALID-HANDLE(ttTable) THEN DELETE OBJECT ttTable NO-ERROR.
|
|
|
|
|
+ httTable = ?.
|
|
|
|
|
+
|
|
|
CREATE TEMP-TABLE ttTable.
|
|
CREATE TEMP-TABLE ttTable.
|
|
|
ttTable:ADD-FIELDS-FROM (cFileName, 'wordindex'). /* Alle Felder aus dem Buffer, ausser wordindex */
|
|
ttTable:ADD-FIELDS-FROM (cFileName, 'wordindex'). /* Alle Felder aus dem Buffer, ausser wordindex */
|
|
|
|
|
|
|
@@ -1148,14 +1088,6 @@ MESSAGE cCompany '-' cFormId '-' htt::FormId.
|
|
|
IF cDirection BEGINS 'des' THEN ttTable:ADD-INDEX-FIELD ('ttTable-k1', cSortField, 'desc').
|
|
IF cDirection BEGINS 'des' THEN ttTable:ADD-INDEX-FIELD ('ttTable-k1', cSortField, 'desc').
|
|
|
ELSE ttTable:ADD-INDEX-FIELD ('ttTable-k1', cSortField).
|
|
ELSE ttTable:ADD-INDEX-FIELD ('ttTable-k1', cSortField).
|
|
|
END.
|
|
END.
|
|
|
- CASE cFileName:
|
|
|
|
|
- /* WHEN 'addresses' THEN */
|
|
|
|
|
- /* DO: */
|
|
|
|
|
- /* ttTable:ADD-NEW-FIELD('lcustomer', 'LOGICAL').*/
|
|
|
|
|
- /* ttTable:ADD-NEW-FIELD('lcreditor', 'LOGICAL').*/
|
|
|
|
|
- /* ttTable:ADD-NEW-FIELD('lsupplier', 'LOGICAL').*/
|
|
|
|
|
- /* END. */
|
|
|
|
|
- END CASE.
|
|
|
|
|
|
|
|
|
|
cFunction = htt::FUNCTION NO-ERROR.
|
|
cFunction = htt::FUNCTION NO-ERROR.
|
|
|
CASE cFunction:
|
|
CASE cFunction:
|
|
@@ -1253,21 +1185,19 @@ MESSAGE cCompany '-' cFormId '-' htt::FormId.
|
|
|
DEFINE VARIABLE rBuffer AS RECID NO-UNDO.
|
|
DEFINE VARIABLE rBuffer AS RECID NO-UNDO.
|
|
|
DEFINE VARIABLE iContact_Id AS INTEGER NO-UNDO.
|
|
DEFINE VARIABLE iContact_Id AS INTEGER NO-UNDO.
|
|
|
|
|
|
|
|
- DEFINE VARIABLE lcttTable AS LONGCHAR NO-UNDO.
|
|
|
|
|
-
|
|
|
|
|
-// oJsonData:WriteFile('C:\TEMP\delete_data.json', TRUE).
|
|
|
|
|
|
|
+ DEFINE VARIABLE lcttTable AS LONGCHAR NO-UNDO.
|
|
|
|
|
+ oJsonData:writefile(SUBSTITUTE('C:\TEMP\delete_jsondata_&1.json', cFileName), TRUE).
|
|
|
oJsonRecord = NEW JsonObject().
|
|
oJsonRecord = NEW JsonObject().
|
|
|
oJsonRecord = oJsonData:GetJsonObject('record') NO-ERROR.
|
|
oJsonRecord = oJsonData:GetJsonObject('record') NO-ERROR.
|
|
|
-// oJsonRecord:WriteFile('C:\TEMP\delete_record.json', TRUE).
|
|
|
|
|
|
|
+
|
|
|
oMasterKeyFields = NEW JsonObject().
|
|
oMasterKeyFields = NEW JsonObject().
|
|
|
oMasterKeyFields = oJsonData:GetJsonObject('masterKeyFields') NO-ERROR.
|
|
oMasterKeyFields = oJsonData:GetJsonObject('masterKeyFields') NO-ERROR.
|
|
|
|
|
|
|
|
CREATE BUFFER hBuffer FOR TABLE cFileName.
|
|
CREATE BUFFER hBuffer FOR TABLE cFileName.
|
|
|
createTempTable().
|
|
createTempTable().
|
|
|
oJsonRecord:Write(lcttTable, FALSE).
|
|
oJsonRecord:Write(lcttTable, FALSE).
|
|
|
-// MESSAGE STRING(lcttTable).
|
|
|
|
|
lOK = ttTable:READ-JSON('longchar', lcttTable, 'EMPTY') NO-ERROR.
|
|
lOK = ttTable:READ-JSON('longchar', lcttTable, 'EMPTY') NO-ERROR.
|
|
|
- outilitiesHandler:evaluateErrorStatus(ERROR-STATUS:HANDLE).
|
|
|
|
|
|
|
+ outilitiesHandler:evaluateErrorStatus(hError).
|
|
|
httTable:FIND-FIRST('', NO-LOCK).
|
|
httTable:FIND-FIRST('', NO-LOCK).
|
|
|
//
|
|
//
|
|
|
// Erzeugen von Where-Statement für UNIQUE-Find
|
|
// Erzeugen von Where-Statement für UNIQUE-Find
|
|
@@ -1276,7 +1206,7 @@ MESSAGE cCompany '-' cFormId '-' htt::FormId.
|
|
|
INPUT httTable,
|
|
INPUT httTable,
|
|
|
OUTPUT cUniqueWhere
|
|
OUTPUT cUniqueWhere
|
|
|
).
|
|
).
|
|
|
-
|
|
|
|
|
|
|
+ MESSAGE 'cUniqueWhere =' cUniqueWhere.
|
|
|
lRetVal = FALSE.
|
|
lRetVal = FALSE.
|
|
|
REPEAT TRANSACTION ON ERROR UNDO, LEAVE:
|
|
REPEAT TRANSACTION ON ERROR UNDO, LEAVE:
|
|
|
lOK = hBuffer:FIND-UNIQUE(cUniqueWhere, NO-LOCK) NO-ERROR.
|
|
lOK = hBuffer:FIND-UNIQUE(cUniqueWhere, NO-LOCK) NO-ERROR.
|
|
@@ -1293,10 +1223,21 @@ MESSAGE cCompany '-' cFormId '-' htt::FormId.
|
|
|
oJsonReturn:ADD('showMessage' , oJsonMessageBox).
|
|
oJsonReturn:ADD('showMessage' , oJsonMessageBox).
|
|
|
RETURN TRUE.
|
|
RETURN TRUE.
|
|
|
END.
|
|
END.
|
|
|
-// MESSAGE 'gefunden'.
|
|
|
|
|
|
|
+
|
|
|
rBuffer = hBuffer:RECID.
|
|
rBuffer = hBuffer:RECID.
|
|
|
hBuffer:BUFFER-RELEASE ().
|
|
hBuffer:BUFFER-RELEASE ().
|
|
|
|
|
|
|
|
|
|
+ cActiveSelection = (IF oJsonIdent:HAS('activeFilter') THEN oJsonIdent:GetCharacter('activeFilter') ELSE '').
|
|
|
|
|
+ IF cActiveSelection = 'LBL_FILTER_ACTIVE' THEN
|
|
|
|
|
+ DO:
|
|
|
|
|
+ outilitiesHandler:evaluatePageNumber(
|
|
|
|
|
+ INPUT-OUTPUT oJsonIdent ,
|
|
|
|
|
+ INPUT cWhere ,
|
|
|
|
|
+ INPUT rBuffer ,
|
|
|
|
|
+ INPUT 'before'
|
|
|
|
|
+ ).
|
|
|
|
|
+ END.
|
|
|
|
|
+
|
|
|
iStartPage = INTEGER(oJsonIdent:GetCharacter('page')) NO-ERROR.
|
|
iStartPage = INTEGER(oJsonIdent:GetCharacter('page')) NO-ERROR.
|
|
|
iIndex = INTEGER(oJsonIdent:GetCharacter('index')) NO-ERROR.
|
|
iIndex = INTEGER(oJsonIdent:GetCharacter('index')) NO-ERROR.
|
|
|
|
|
|
|
@@ -1347,18 +1288,27 @@ MESSAGE cCompany '-' cFormId '-' htt::FormId.
|
|
|
|
|
|
|
|
LEAVE.
|
|
LEAVE.
|
|
|
END.
|
|
END.
|
|
|
|
|
+
|
|
|
|
|
+ IF cFileName = 'addresses' OR
|
|
|
|
|
+ cFileName = 'communication' THEN
|
|
|
|
|
+ DO:
|
|
|
|
|
+ updateCommunication(
|
|
|
|
|
+ INPUT iContact_Id
|
|
|
|
|
+ ).
|
|
|
|
|
+ END.
|
|
|
|
|
+ fillWordIndexTable().
|
|
|
//
|
|
//
|
|
|
// Letzte Abfrage wiederholen und Temp-Tabelle füllen
|
|
// Letzte Abfrage wiederholen und Temp-Tabelle füllen
|
|
|
//
|
|
//
|
|
|
outilitiesHandler:readLastcWhere(
|
|
outilitiesHandler:readLastcWhere(
|
|
|
INPUT oJsonIdent,
|
|
INPUT oJsonIdent,
|
|
|
INPUT cFileName,
|
|
INPUT cFileName,
|
|
|
- OUTPUT cWhere) NO-ERROR.
|
|
|
|
|
- outilitiesHandler:evaluateErrorStatus(ERROR-STATUS:HANDLE).
|
|
|
|
|
-
|
|
|
|
|
- httTable:EMPTY-TEMP-TABLE ().
|
|
|
|
|
|
|
+ OUTPUT cWhere
|
|
|
|
|
+ ) NO-ERROR.
|
|
|
|
|
+ outilitiesHandler:evaluateErrorStatus(hError).
|
|
|
|
|
+ MESSAGE 'cWhere nach Löschung ' cWhere.
|
|
|
createTempTable().
|
|
createTempTable().
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
fillTemptableFromTable(
|
|
fillTemptableFromTable(
|
|
|
OUTPUT oJsonReturn
|
|
OUTPUT oJsonReturn
|
|
|
).
|
|
).
|
|
@@ -1377,16 +1327,6 @@ MESSAGE cCompany '-' cFormId '-' htt::FormId.
|
|
|
LEAVE.
|
|
LEAVE.
|
|
|
END.
|
|
END.
|
|
|
|
|
|
|
|
- IF cFileName = 'addresses' OR
|
|
|
|
|
- cFileName = 'communication' THEN
|
|
|
|
|
- DO:
|
|
|
|
|
- updateCommunication(
|
|
|
|
|
- INPUT iContact_Id
|
|
|
|
|
- ).
|
|
|
|
|
- END.
|
|
|
|
|
- fillWordIndexTable().
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
IF lRetVal THEN
|
|
IF lRetVal THEN
|
|
|
DO:
|
|
DO:
|
|
|
oJsonReturn:ADD('success', TRUE).
|
|
oJsonReturn:ADD('success', TRUE).
|
|
@@ -1438,6 +1378,7 @@ MESSAGE cCompany '-' cFormId '-' htt::FormId.
|
|
|
DEFINE VARIABLE cField AS CHARACTER NO-UNDO.
|
|
DEFINE VARIABLE cField AS CHARACTER NO-UNDO.
|
|
|
DEFINE VARIABLE cFieldValue AS CHARACTER NO-UNDO.
|
|
DEFINE VARIABLE cFieldValue AS CHARACTER NO-UNDO.
|
|
|
DEFINE VARIABLE cPreWhere AS CHARACTER NO-UNDO.
|
|
DEFINE VARIABLE cPreWhere AS CHARACTER NO-UNDO.
|
|
|
|
|
+ DEFINE VARIABLE rBefore AS RECID NO-UNDO.
|
|
|
|
|
|
|
|
DEFINE VARIABLE oRecords AS JsonArray NO-UNDO.
|
|
DEFINE VARIABLE oRecords AS JsonArray NO-UNDO.
|
|
|
DEFINE VARIABLE oInfoRecord AS JsonObject NO-UNDO.
|
|
DEFINE VARIABLE oInfoRecord AS JsonObject NO-UNDO.
|
|
@@ -1467,15 +1408,16 @@ MESSAGE cCompany '-' cFormId '-' htt::FormId.
|
|
|
//
|
|
//
|
|
|
// MESSAGE '-> MaxRecords =' iMaxRecords SKIP 'Startpage =' iStartPage SKIP 'Index =' iIndex SKIP 'Startrecord =' iStartRecord.
|
|
// MESSAGE '-> MaxRecords =' iMaxRecords SKIP 'Startpage =' iStartPage SKIP 'Index =' iIndex SKIP 'Startrecord =' iStartRecord.
|
|
|
// MESSAGE 'cWhere in fillTempTable =' cFileName '->' cWhere.
|
|
// MESSAGE 'cWhere in fillTempTable =' cFileName '->' cWhere.
|
|
|
- cPreWhere = REPLACE(cWhere, 'FOR', 'PRESELECT').
|
|
|
|
|
- CREATE QUERY hQuery.
|
|
|
|
|
|
|
+ cPreWhere = SUBSTITUTE(' PRESELECT EACH &1 &2 NO-LOCK ', cFileName, cWhere) NO-ERROR.
|
|
|
|
|
+// MESSAGE 'cPreWhere in fillTempTable =' cPreWhere.
|
|
|
|
|
+ CREATE QUERY hQuery.
|
|
|
|
|
|
|
|
CREATE BUFFER hBuffer FOR TABLE cFileName.
|
|
CREATE BUFFER hBuffer FOR TABLE cFileName.
|
|
|
hQuery:SET-BUFFERS (hBuffer) NO-ERROR.
|
|
hQuery:SET-BUFFERS (hBuffer) NO-ERROR.
|
|
|
- outilitiesHandler:evaluateErrorStatus(ERROR-STATUS:HANDLE).
|
|
|
|
|
|
|
+ outilitiesHandler:evaluateErrorStatus(hError).
|
|
|
|
|
|
|
|
hQuery:QUERY-PREPARE (cPreWhere) NO-ERROR.
|
|
hQuery:QUERY-PREPARE (cPreWhere) NO-ERROR.
|
|
|
- outilitiesHandler:evaluateErrorStatus(ERROR-STATUS:HANDLE).
|
|
|
|
|
|
|
+ outilitiesHandler:evaluateErrorStatus(hError).
|
|
|
|
|
|
|
|
hQuery:QUERY-OPEN ().
|
|
hQuery:QUERY-OPEN ().
|
|
|
|
|
|
|
@@ -1484,13 +1426,15 @@ MESSAGE cCompany '-' cFormId '-' htt::FormId.
|
|
|
hQuery:GET-NEXT ().
|
|
hQuery:GET-NEXT ().
|
|
|
iCurrentPosition = 0.
|
|
iCurrentPosition = 0.
|
|
|
iAnzahlRecords = 0.
|
|
iAnzahlRecords = 0.
|
|
|
- MESSAGE 'Start query mit StartRecord ' iStartRecord 'und cWhere ' cWhere.
|
|
|
|
|
|
|
+// MESSAGE 'Start query mit StartRecord ' iStartRecord 'und cWhere ' cPreWhere.
|
|
|
|
|
+ ttTable:EMPTY-TEMP-TABLE ().
|
|
|
DO WHILE NOT hQuery:QUERY-OFF-END:
|
|
DO WHILE NOT hQuery:QUERY-OFF-END:
|
|
|
IF iCurrentPosition = 0 THEN iCurrentPosition = iStartRecord.
|
|
IF iCurrentPosition = 0 THEN iCurrentPosition = iStartRecord.
|
|
|
iAnzahlRecords = iAnzahlRecords + 1.
|
|
iAnzahlRecords = iAnzahlRecords + 1.
|
|
|
httTable:BUFFER-CREATE().
|
|
httTable:BUFFER-CREATE().
|
|
|
httTable:BUFFER-COPY(hBuffer).
|
|
httTable:BUFFER-COPY(hBuffer).
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
|
|
+ rBefore = hBuffer:RECID.
|
|
|
IF rBuffer <> ? AND hBuffer:RECID = rBuffer THEN iIndex = iAnzahlRecords - 1.
|
|
IF rBuffer <> ? AND hBuffer:RECID = rBuffer THEN iIndex = iAnzahlRecords - 1.
|
|
|
IF iAnzahlRecords >= iMaxRecords THEN LEAVE.
|
|
IF iAnzahlRecords >= iMaxRecords THEN LEAVE.
|
|
|
hQuery:GET-NEXT ().
|
|
hQuery:GET-NEXT ().
|
|
@@ -1514,19 +1458,18 @@ MESSAGE cCompany '-' cFormId '-' htt::FormId.
|
|
|
lFound = TRUE.
|
|
lFound = TRUE.
|
|
|
cField = httTable:BUFFER-FIELD(i1):NAME.
|
|
cField = httTable:BUFFER-FIELD(i1):NAME.
|
|
|
cField = REPLACE(cField, '_BoxField', '').
|
|
cField = REPLACE(cField, '_BoxField', '').
|
|
|
-// MESSAGE 'Boxfield-Name' cField.
|
|
|
|
|
hField = httTable:BUFFER-FIELD(cField):HANDLE NO-ERROR.
|
|
hField = httTable:BUFFER-FIELD(cField):HANDLE NO-ERROR.
|
|
|
IF ERROR-STATUS:ERROR THEN NEXT.
|
|
IF ERROR-STATUS:ERROR THEN NEXT.
|
|
|
IF NOT VALID-HANDLE(hField) THEN NEXT.
|
|
IF NOT VALID-HANDLE(hField) THEN NEXT.
|
|
|
cFieldValue = hField:BUFFER-VALUE.
|
|
cFieldValue = hField:BUFFER-VALUE.
|
|
|
-// MESSAGE 'Boxfield ' cField '-' cFieldValue '-' htt::user_name.
|
|
|
|
|
|
|
+
|
|
|
httTable:BUFFER-FIELD(i1):BUFFER-VALUE =
|
|
httTable:BUFFER-FIELD(i1):BUFFER-VALUE =
|
|
|
outilitiesHandler:getBoxFieldText(
|
|
outilitiesHandler:getBoxFieldText(
|
|
|
INPUT oJsonIdent ,
|
|
INPUT oJsonIdent ,
|
|
|
INPUT cField ,
|
|
INPUT cField ,
|
|
|
INPUT cFieldValue
|
|
INPUT cFieldValue
|
|
|
) NO-ERROR.
|
|
) NO-ERROR.
|
|
|
-// MESSAGE httTable:BUFFER-FIELD(i1):BUFFER-VALUE.
|
|
|
|
|
|
|
+
|
|
|
END.
|
|
END.
|
|
|
IF lFound = FALSE THEN LEAVE.
|
|
IF lFound = FALSE THEN LEAVE.
|
|
|
hQuery:GET-NEXT () NO-ERROR.
|
|
hQuery:GET-NEXT () NO-ERROR.
|
|
@@ -1538,7 +1481,8 @@ MESSAGE cCompany '-' cFormId '-' htt::FormId.
|
|
|
|
|
|
|
|
oRecords = NEW JsonArray().
|
|
oRecords = NEW JsonArray().
|
|
|
httTable:WRITE-JSON('JsonArray', oRecords).
|
|
httTable:WRITE-JSON('JsonArray', oRecords).
|
|
|
-// oRecords:WriteFile(SUBSTITUTE('C:\TEMP\&1_records.json', htt::FormId), TRUE).
|
|
|
|
|
|
|
+// MESSAGE 'ttTable gefüllt ' iANzahlRecords.
|
|
|
|
|
+// oRecords:WriteFile(SUBSTITUTE('C:\TEMP\fillTempTable_&1_records.json', htt::FormId), TRUE).
|
|
|
|
|
|
|
|
iPageCounter = iTotalRecords / iMaxRecords.
|
|
iPageCounter = iTotalRecords / iMaxRecords.
|
|
|
IF (iPageCounter * iMaxRecords) < iTotalRecords THEN iPageCounter = iPageCounter + 1.
|
|
IF (iPageCounter * iMaxRecords) < iTotalRecords THEN iPageCounter = iPageCounter + 1.
|
|
@@ -1567,7 +1511,8 @@ MESSAGE cCompany '-' cFormId '-' htt::FormId.
|
|
|
END.
|
|
END.
|
|
|
|
|
|
|
|
iRetVal = iAnzahlRecords.
|
|
iRetVal = iAnzahlRecords.
|
|
|
- MESSAGE 'ende filltable'.
|
|
|
|
|
|
|
+// oJsonReturn:WriteFile(SUBSTITUTE('C:\TEMP\fillTempTable_return_&1.json', cFormId), TRUE).
|
|
|
|
|
+// MESSAGE 'ende filltable'.
|
|
|
RETURN iRetVal.
|
|
RETURN iRetVal.
|
|
|
|
|
|
|
|
END METHOD.
|
|
END METHOD.
|
|
@@ -1587,8 +1532,6 @@ MESSAGE cCompany '-' cFormId '-' htt::FormId.
|
|
|
DEFINE VARIABLE cCommTypes AS CHARACTER NO-UNDO
|
|
DEFINE VARIABLE cCommTypes AS CHARACTER NO-UNDO
|
|
|
INIT '1,2,3,4,6'.
|
|
INIT '1,2,3,4,6'.
|
|
|
|
|
|
|
|
- outilitiesHandler = NEW utilitiesHandler().
|
|
|
|
|
-
|
|
|
|
|
EMPTY TEMP-TABLE ttWordIndexTable.
|
|
EMPTY TEMP-TABLE ttWordIndexTable.
|
|
|
|
|
|
|
|
FIND addresses NO-LOCK
|
|
FIND addresses NO-LOCK
|
|
@@ -1668,7 +1611,7 @@ MESSAGE cCompany '-' cFormId '-' htt::FormId.
|
|
|
INPUT hwibuffer
|
|
INPUT hwibuffer
|
|
|
).
|
|
).
|
|
|
|
|
|
|
|
- MESSAGE 'wordIndex =' cValue.
|
|
|
|
|
|
|
+// MESSAGE 'wordIndex =' cValue.
|
|
|
REPEAT TRANSACTION ON ERROR UNDO, LEAVE:
|
|
REPEAT TRANSACTION ON ERROR UNDO, LEAVE:
|
|
|
FIND addresses
|
|
FIND addresses
|
|
|
WHERE addresses.address_id = iAddress_id NO-ERROR.
|
|
WHERE addresses.address_id = iAddress_id NO-ERROR.
|
|
@@ -1728,6 +1671,7 @@ MESSAGE cCompany '-' cFormId '-' htt::FormId.
|
|
|
//
|
|
//
|
|
|
// Ermitteln des Tabellennamens, ob die Tabelle das Feld "company" und/oder das Feld "active" enthält
|
|
// Ermitteln des Tabellennamens, ob die Tabelle das Feld "company" und/oder das Feld "active" enthält
|
|
|
//
|
|
//
|
|
|
|
|
+ MESSAGE 'getChanges'.
|
|
|
outilitiesHandler:evaluateFile(
|
|
outilitiesHandler:evaluateFile(
|
|
|
INPUT-OUTPUT oJsonIdent ,
|
|
INPUT-OUTPUT oJsonIdent ,
|
|
|
OUTPUT cFileName ,
|
|
OUTPUT cFileName ,
|
|
@@ -1776,7 +1720,7 @@ MESSAGE cCompany '-' cFormId '-' htt::FormId.
|
|
|
IF hField:DATA-TYPE = 'date' THEN hField:BUFFER-VALUE = DATE(outilitiesHandler:iso2date(cValue)).
|
|
IF hField:DATA-TYPE = 'date' THEN hField:BUFFER-VALUE = DATE(outilitiesHandler:iso2date(cValue)).
|
|
|
END.
|
|
END.
|
|
|
END CASE.
|
|
END CASE.
|
|
|
- lOk = outilitiesHandler:evaluateErrorStatus(ERROR-STATUS:HANDLE).
|
|
|
|
|
|
|
+ lOk = outilitiesHandler:evaluateErrorStatus(hError).
|
|
|
IF lOk THEN NEXT.
|
|
IF lOk THEN NEXT.
|
|
|
END.
|
|
END.
|
|
|
// httTable:WRITE-JSON ('FILE', 'C:\TEMP\ttTable_Inhalt.json', TRUE).
|
|
// httTable:WRITE-JSON ('FILE', 'C:\TEMP\ttTable_Inhalt.json', TRUE).
|
|
@@ -1859,17 +1803,17 @@ MESSAGE cCompany '-' cFormId '-' htt::FormId.
|
|
|
iAnzRec = 0.
|
|
iAnzRec = 0.
|
|
|
ttTable:EMPTY-TEMP-TABLE ().
|
|
ttTable:EMPTY-TEMP-TABLE ().
|
|
|
CREATE QUERY hQuery.
|
|
CREATE QUERY hQuery.
|
|
|
- cWhere = SUBSTITUTE('FOR EACH &1 NO-LOCK &2 ', cFileName, cWhere) NO-ERROR.
|
|
|
|
|
|
|
+// cWhere = SUBSTITUTE('FOR EACH &1 NO-LOCK &2 ', cFileName, cWhere) NO-ERROR.
|
|
|
// MESSAGE 'cWhere loaddate for ' cFileName '->' cWhere.
|
|
// MESSAGE 'cWhere loaddate for ' cFileName '->' cWhere.
|
|
|
-// oJsonIdent:WriteFile('C:\TEMP\getData_oJsonIdent.json', TRUE ).
|
|
|
|
|
- IF NOT oJsonIdent:HAS('search') THEN
|
|
|
|
|
- DO:
|
|
|
|
|
- outilitiesHandler:writeLastcWhere(
|
|
|
|
|
- INPUT oJsonIdent ,
|
|
|
|
|
- INPUT cFileName ,
|
|
|
|
|
- INPUT cWhere
|
|
|
|
|
- ).
|
|
|
|
|
- END.
|
|
|
|
|
|
|
+ oJsonIdent:WriteFile('C:\TEMP\getData_oJsonIdent.json', TRUE ).
|
|
|
|
|
+ /* IF NOT oJsonIdent:HAS('search') THEN */
|
|
|
|
|
+ /* DO: */
|
|
|
|
|
+ /* outilitiesHandler:writeLastcWhere(*/
|
|
|
|
|
+ /* INPUT oJsonIdent , */
|
|
|
|
|
+ /* INPUT cFileName , */
|
|
|
|
|
+ /* INPUT cWhere */
|
|
|
|
|
+ /* ). */
|
|
|
|
|
+ /* END. */
|
|
|
//
|
|
//
|
|
|
// Für das Dynamische Query wird PRESELECT verwendet für die Pagination
|
|
// Für das Dynamische Query wird PRESELECT verwendet für die Pagination
|
|
|
//
|
|
//
|
|
@@ -1938,6 +1882,7 @@ MESSAGE cCompany '-' cFormId '-' htt::FormId.
|
|
|
|
|
|
|
|
DEFINE VARIABLE oJsonRecord AS JsonObject NO-UNDO.
|
|
DEFINE VARIABLE oJsonRecord AS JsonObject NO-UNDO.
|
|
|
DEFINE VARIABLE oJsonSelectBoxes AS JsonObject NO-UNDO.
|
|
DEFINE VARIABLE oJsonSelectBoxes AS JsonObject NO-UNDO.
|
|
|
|
|
+ DEFINE VARIABLE oInfoRecord AS JsonObject NO-UNDO.
|
|
|
|
|
|
|
|
CREATE BUFFER hBuffer FOR TABLE cFileName.
|
|
CREATE BUFFER hBuffer FOR TABLE cFileName.
|
|
|
createTempTable().
|
|
createTempTable().
|
|
@@ -1970,11 +1915,16 @@ MESSAGE cCompany '-' cFormId '-' htt::FormId.
|
|
|
INPUT oJsonIdent ,
|
|
INPUT oJsonIdent ,
|
|
|
OUTPUT oJsonSelectBoxes
|
|
OUTPUT oJsonSelectBoxes
|
|
|
).
|
|
).
|
|
|
|
|
+
|
|
|
|
|
+ createInfoRecord(
|
|
|
|
|
+ OUTPUT oInfoRecord
|
|
|
|
|
+ ).
|
|
|
|
|
|
|
|
lOk = TRUE.
|
|
lOk = TRUE.
|
|
|
oJsonReturn = NEW JsonObject().
|
|
oJsonReturn = NEW JsonObject().
|
|
|
oJsonReturn:ADD('success', lOK ).
|
|
oJsonReturn:ADD('success', lOK ).
|
|
|
oJsonReturn:ADD('record' , oJsonRecord).
|
|
oJsonReturn:ADD('record' , oJsonRecord).
|
|
|
|
|
+ IF VALID-OBJECT(oInfoRecord) THEN oJsonReturn:ADD('infoRecord' , oInfoRecord ).
|
|
|
IF VALID-OBJECT(oJsonSelectBoxes) THEN oJsonReturn:ADD('selectOptions', oJsonSelectBoxes).
|
|
IF VALID-OBJECT(oJsonSelectBoxes) THEN oJsonReturn:ADD('selectOptions', oJsonSelectBoxes).
|
|
|
|
|
|
|
|
|
|
|
|
@@ -1992,61 +1942,61 @@ MESSAGE cCompany '-' cFormId '-' htt::FormId.
|
|
|
------------------------------------------------------------------------------*/
|
|
------------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
METHOD PUBLIC LOGICAL rebuildData(
|
|
METHOD PUBLIC LOGICAL rebuildData(
|
|
|
- INPUT oJsonData AS JsonObject,
|
|
|
|
|
OUTPUT oJsonReturn AS JsonObject
|
|
OUTPUT oJsonReturn AS JsonObject
|
|
|
):
|
|
):
|
|
|
|
|
|
|
|
- DEFINE VARIABLE ii AS INTEGER NO-UNDO.
|
|
|
|
|
- DEFINE VARIABLE i1 AS INTEGER NO-UNDO.
|
|
|
|
|
|
|
+ /* DEFINE VARIABLE ii AS INTEGER NO-UNDO.*/
|
|
|
|
|
+ /* DEFINE VARIABLE i1 AS INTEGER NO-UNDO.*/
|
|
|
|
|
+ DEFINE VARIABLE iAnzRec AS INTEGER NO-UNDO.
|
|
|
DEFINE VARIABLE lRetVal AS LOGICAL NO-UNDO.
|
|
DEFINE VARIABLE lRetVal AS LOGICAL NO-UNDO.
|
|
|
- DEFINE VARIABLE cValue AS CHARACTER NO-UNDO.
|
|
|
|
|
|
|
+ DEFINE VARIABLE iRetVal AS INTEGER NO-UNDO.
|
|
|
DEFINE VARIABLE lOK AS LOGICAL NO-UNDO.
|
|
DEFINE VARIABLE lOK AS LOGICAL NO-UNDO.
|
|
|
- DEFINE VARIABLE rBuffer AS RECID NO-UNDO.
|
|
|
|
|
- DEFINE VARIABLE iTotalRecords AS INTEGER NO-UNDO.
|
|
|
|
|
- DEFINE VARIABLE hFeld AS HANDLE NO-UNDO.
|
|
|
|
|
DEFINE VARIABLE cAddress AS CHARACTER NO-UNDO.
|
|
DEFINE VARIABLE cAddress AS CHARACTER NO-UNDO.
|
|
|
- DEFINE VARIABLE cUniqueWhere AS CHARACTER NO-UNDO.
|
|
|
|
|
|
|
+ DEFINE VARIABLE hFeld AS HANDLE NO-UNDO.
|
|
|
|
|
+ DEFINE VARIABLE cFormUser AS CHARACTER NO-UNDO.
|
|
|
DEFINE VARIABLE hUniqueBuffer AS HANDLE NO-UNDO.
|
|
DEFINE VARIABLE hUniqueBuffer AS HANDLE NO-UNDO.
|
|
|
|
|
+ DEFINE VARIABLE rBuffer AS RECID NO-UNDO.
|
|
|
|
|
|
|
|
|
|
+ DEFINE VARIABLE oRecords AS JsonArray NO-UNDO.
|
|
|
|
|
+ DEFINE VARIABLE oJsonEditable AS JsonArray NO-UNDO.
|
|
|
|
|
+ DEFINE VARIABLE oJsonBox AS JsonArray NO-UNDO.
|
|
|
DEFINE VARIABLE oJsonSelectBoxes AS JsonObject NO-UNDO.
|
|
DEFINE VARIABLE oJsonSelectBoxes AS JsonObject NO-UNDO.
|
|
|
-
|
|
|
|
|
- outilitiesHandler = NEW utilitiesHandler().
|
|
|
|
|
- oselectboxHandler = NEW selectboxHandler().
|
|
|
|
|
-
|
|
|
|
|
- cFileName = oJsonIdent:GetCharacter('file_name').
|
|
|
|
|
|
|
+ DEFINE VARIABLE oJsonMessageBox AS JsonObject NO-UNDO.
|
|
|
|
|
+ DEFINE VARIABLE oInfoRecord AS JsonObject NO-UNDO.
|
|
|
|
|
+
|
|
|
outilitiesHandler:readLastRecord(
|
|
outilitiesHandler:readLastRecord(
|
|
|
INPUT oJsonIdent ,
|
|
INPUT oJsonIdent ,
|
|
|
OUTPUT cUniqueWhere
|
|
OUTPUT cUniqueWhere
|
|
|
).
|
|
).
|
|
|
-// MESSAGE 'cUniqueWhere fuer UNIQE-FIND' cUniqueWhere.
|
|
|
|
|
|
|
+
|
|
|
CREATE BUFFER hUniqueBuffer FOR TABLE cFileName.
|
|
CREATE BUFFER hUniqueBuffer FOR TABLE cFileName.
|
|
|
hUniqueBuffer:FIND-UNIQUE (cUniqueWhere, NO-LOCK).
|
|
hUniqueBuffer:FIND-UNIQUE (cUniqueWhere, NO-LOCK).
|
|
|
rBuffer = hUniqueBuffer:RECID.
|
|
rBuffer = hUniqueBuffer:RECID.
|
|
|
oJsonIdent:ADD('rBuffer', INT64(rBuffer)).
|
|
oJsonIdent:ADD('rBuffer', INT64(rBuffer)).
|
|
|
-// MESSAGE hUniqueBuffer::address_id '-' rBuffer.
|
|
|
|
|
- outilitiesHandler:readLastcWhere(
|
|
|
|
|
- INPUT oJsonIdent,
|
|
|
|
|
- INPUT cFileName ,
|
|
|
|
|
- OUTPUT cWhere
|
|
|
|
|
- ).
|
|
|
|
|
|
|
+
|
|
|
|
|
+ IF oJsonIdent:HAS('search') THEN
|
|
|
|
|
+ DO:
|
|
|
|
|
+ oJsonIdent:Remove('search') NO-ERROR.
|
|
|
|
|
+ oJsonIdent:SET('lSearch', FALSE) NO-ERROR.
|
|
|
|
|
+ END.
|
|
|
|
|
+
|
|
|
|
|
+ buildWhere().
|
|
|
|
|
+
|
|
|
outilitiesHandler:evaluatePageNumber(
|
|
outilitiesHandler:evaluatePageNumber(
|
|
|
INPUT-OUTPUT oJsonIdent ,
|
|
INPUT-OUTPUT oJsonIdent ,
|
|
|
INPUT cWhere ,
|
|
INPUT cWhere ,
|
|
|
- INPUT rBuffer
|
|
|
|
|
|
|
+ INPUT rBuffer ,
|
|
|
|
|
+ INPUT 'current'
|
|
|
).
|
|
).
|
|
|
-// oJsonIdent:WriteFile('C:\TEMP\address_rebuildData_JsonIdent.json', TRUE).
|
|
|
|
|
-// MESSAGE 'LAST-WHERE' cWhere.
|
|
|
|
|
|
|
|
|
|
- createTempTable().
|
|
|
|
|
-
|
|
|
|
|
- fillTemptableFromTable(
|
|
|
|
|
|
|
+ // createTempTable().
|
|
|
|
|
+ iAnzRec = fillTemptableFromTable(
|
|
|
OUTPUT oJsonReturn
|
|
OUTPUT oJsonReturn
|
|
|
).
|
|
).
|
|
|
|
|
|
|
|
- hUniqueBuffer:FIND-UNIQUE (cUniqueWhere, NO-LOCK) NO-ERROR.
|
|
|
|
|
- outilitiesHandler:evaluateErrorStatus(ERROR-STATUS:HANDLE).
|
|
|
|
|
|
|
+ /* hUniqueBuffer:FIND-UNIQUE (cUniqueWhere, NO-LOCK) NO-ERROR.*/
|
|
|
|
|
+ /* outilitiesHandler:evaluateErrorStatus(hError).*/
|
|
|
oJsonIdent:SET('language_id', hUniqueBuffer::language_id).
|
|
oJsonIdent:SET('language_id', hUniqueBuffer::language_id).
|
|
|
-
|
|
|
|
|
oselectboxHandler:getVariableSelectBoxes(
|
|
oselectboxHandler:getVariableSelectBoxes(
|
|
|
INPUT oJsonIdent ,
|
|
INPUT oJsonIdent ,
|
|
|
OUTPUT oJsonSelectBoxes
|
|
OUTPUT oJsonSelectBoxes
|
|
@@ -2090,7 +2040,7 @@ MESSAGE cCompany '-' cFormId '-' htt::FormId.
|
|
|
oJsonRecord = oJsonData:GetJsonObject('record').
|
|
oJsonRecord = oJsonData:GetJsonObject('record').
|
|
|
// oJsonRecord:WriteFile('C:\Temp\RecordChange_record.json', TRUE).
|
|
// oJsonRecord:WriteFile('C:\Temp\RecordChange_record.json', TRUE).
|
|
|
httTable:READ-JSON('JsonObject', oJsonRecord) NO-ERROR.
|
|
httTable:READ-JSON('JsonObject', oJsonRecord) NO-ERROR.
|
|
|
- outilitiesHandler:evaluateErrorStatus(ERROR-STATUS:HANDLE).
|
|
|
|
|
|
|
+ outilitiesHandler:evaluateErrorStatus(hError).
|
|
|
//
|
|
//
|
|
|
// den ersten Datensatz in der TEMP-TABLE lesen
|
|
// den ersten Datensatz in der TEMP-TABLE lesen
|
|
|
//
|
|
//
|
|
@@ -2111,12 +2061,12 @@ MESSAGE cCompany '-' cFormId '-' htt::FormId.
|
|
|
INPUT cUniqueWhere
|
|
INPUT cUniqueWhere
|
|
|
).
|
|
).
|
|
|
|
|
|
|
|
- outilitiesHandler:readLastcWhere(
|
|
|
|
|
- INPUT oJsonIdent ,
|
|
|
|
|
- INPUT cFileName ,
|
|
|
|
|
- OUTPUT cWhere
|
|
|
|
|
- ).
|
|
|
|
|
-
|
|
|
|
|
|
|
+ /* outilitiesHandler:readLastcWhere(*/
|
|
|
|
|
+ /* INPUT oJsonIdent , */
|
|
|
|
|
+ /* INPUT cFileName , */
|
|
|
|
|
+ /* OUTPUT cWhere */
|
|
|
|
|
+ /* ). */
|
|
|
|
|
+ /* */
|
|
|
createInfoRecord(
|
|
createInfoRecord(
|
|
|
OUTPUT oInfoRecord
|
|
OUTPUT oInfoRecord
|
|
|
).
|
|
).
|
|
@@ -2220,9 +2170,8 @@ MESSAGE cCompany '-' cFormId '-' htt::FormId.
|
|
|
INPUT iContact_Id AS INTEGER
|
|
INPUT iContact_Id AS INTEGER
|
|
|
):
|
|
):
|
|
|
|
|
|
|
|
- DEFINE VARIABLE hBuffer AS HANDLE NO-UNDO.
|
|
|
|
|
- DEFINE VARIABLE cWhere AS CHARACTER NO-UNDO.
|
|
|
|
|
- MESSAGE 'cFileName in updateCommunication' cFileName.
|
|
|
|
|
|
|
+ DEFINE VARIABLE hBuffer AS HANDLE NO-UNDO.
|
|
|
|
|
+ DEFINE VARIABLE cAddrWhere AS CHARACTER NO-UNDO.
|
|
|
|
|
|
|
|
IF iContact_Id > 0 THEN RETURN.
|
|
IF iContact_Id > 0 THEN RETURN.
|
|
|
|
|
|
|
@@ -2233,8 +2182,8 @@ MESSAGE cCompany '-' cFormId '-' htt::FormId.
|
|
|
WHEN 'addresses' THEN
|
|
WHEN 'addresses' THEN
|
|
|
DO:
|
|
DO:
|
|
|
CREATE BUFFER hBuffer FOR TABLE cFileName.
|
|
CREATE BUFFER hBuffer FOR TABLE cFileName.
|
|
|
- cWhere = SUBSTITUTE('WHERE &1.address_id = &2', cFileName, iAddress_Id).
|
|
|
|
|
- hBuffer:FIND-UNIQUE (cWhere, NO-LOCK).
|
|
|
|
|
|
|
+ cAddrWhere = SUBSTITUTE('WHERE &1.address_id = &2', cFileName, iAddress_Id).
|
|
|
|
|
+ hBuffer:FIND-UNIQUE (cAddrWhere, NO-LOCK).
|
|
|
|
|
|
|
|
EMPTY TEMP-TABLE ttcommunication.
|
|
EMPTY TEMP-TABLE ttcommunication.
|
|
|
CREATE ttcommunication.
|
|
CREATE ttcommunication.
|
|
@@ -2335,8 +2284,8 @@ MESSAGE cCompany '-' cFormId '-' htt::FormId.
|
|
|
addresses.phone_private = ''
|
|
addresses.phone_private = ''
|
|
|
addresses.mobile_business = ''
|
|
addresses.mobile_business = ''
|
|
|
addresses.mobile_private = ''
|
|
addresses.mobile_private = ''
|
|
|
- addresses.fax = ''
|
|
|
|
|
- addresses.e-mail = ''
|
|
|
|
|
|
|
+ addresses.fax = ''
|
|
|
|
|
+ addresses.e-mail = ''
|
|
|
.
|
|
.
|
|
|
IF cFunction = 'delete' THEN
|
|
IF cFunction = 'delete' THEN
|
|
|
DO:
|
|
DO:
|
|
@@ -2412,7 +2361,7 @@ MESSAGE cCompany '-' cFormId '-' htt::FormId.
|
|
|
oJsonRecord:Write(lcttTable, FALSE).
|
|
oJsonRecord:Write(lcttTable, FALSE).
|
|
|
// MESSAGE STRING(lcttTable).
|
|
// MESSAGE STRING(lcttTable).
|
|
|
lOK = ttTable:READ-JSON('longchar', lcttTable, 'EMPTY') NO-ERROR.
|
|
lOK = ttTable:READ-JSON('longchar', lcttTable, 'EMPTY') NO-ERROR.
|
|
|
- outilitiesHandler:evaluateErrorStatus(ERROR-STATUS:HANDLE).
|
|
|
|
|
|
|
+ outilitiesHandler:evaluateErrorStatus(hError).
|
|
|
httTable:FIND-FIRST('', NO-LOCK).
|
|
httTable:FIND-FIRST('', NO-LOCK).
|
|
|
// MESSAGE 'e'.
|
|
// MESSAGE 'e'.
|
|
|
//
|
|
//
|
|
@@ -2486,8 +2435,8 @@ MESSAGE cCompany '-' cFormId '-' htt::FormId.
|
|
|
|
|
|
|
|
lOK = hBuffer:BUFFER-COMPARE(httTable, 'case-sensitive') NO-ERROR.
|
|
lOK = hBuffer:BUFFER-COMPARE(httTable, 'case-sensitive') NO-ERROR.
|
|
|
hBuffer:BUFFER-COPY(httTable) NO-ERROR.
|
|
hBuffer:BUFFER-COPY(httTable) NO-ERROR.
|
|
|
- outilitiesHandler:evaluateErrorStatus(ERROR-STATUS:HANDLE).
|
|
|
|
|
-
|
|
|
|
|
|
|
+ outilitiesHandler:evaluateErrorStatus(hError).
|
|
|
|
|
+// MESSAGE 'compare ergab' lOK.
|
|
|
hField = hBuffer:BUFFER-FIELD('updated_at'):HANDLE NO-ERROR.
|
|
hField = hBuffer:BUFFER-FIELD('updated_at'):HANDLE NO-ERROR.
|
|
|
IF NOT ERROR-STATUS:ERROR AND
|
|
IF NOT ERROR-STATUS:ERROR AND
|
|
|
VALID-HANDLE(hField) THEN hField:BUFFER-VALUE = NOW.
|
|
VALID-HANDLE(hField) THEN hField:BUFFER-VALUE = NOW.
|
|
@@ -2507,7 +2456,8 @@ MESSAGE cCompany '-' cFormId '-' htt::FormId.
|
|
|
//
|
|
//
|
|
|
// Anschrift und Briefanrede erstellen
|
|
// Anschrift und Briefanrede erstellen
|
|
|
//
|
|
//
|
|
|
- iFormTabIndex = htt::FormTabIndex.
|
|
|
|
|
|
|
+ iFormTabIndex = 1.
|
|
|
|
|
+ IF oJsonIdent:HAS('formTabIndex') THEN iFormTabIndex = INTEGER(oJsonIdent:GetJsonText('formTabIndex')).
|
|
|
IF iFormTabIndex = 1 AND
|
|
IF iFormTabIndex = 1 AND
|
|
|
cFileName = 'addresses' AND
|
|
cFileName = 'addresses' AND
|
|
|
NOT httTable::address_fix THEN
|
|
NOT httTable::address_fix THEN
|
|
@@ -2531,9 +2481,8 @@ MESSAGE cCompany '-' cFormId '-' htt::FormId.
|
|
|
lRetVal = TRUE.
|
|
lRetVal = TRUE.
|
|
|
LEAVE.
|
|
LEAVE.
|
|
|
END.
|
|
END.
|
|
|
- MESSAGE 'start fillwordindex'.
|
|
|
|
|
|
|
+
|
|
|
fillWordIndexTable().
|
|
fillWordIndexTable().
|
|
|
- MESSAGE 'ende fillwordindex'.
|
|
|
|
|
|
|
|
|
|
IF lRetVal THEN
|
|
IF lRetVal THEN
|
|
|
DO:
|
|
DO:
|
|
@@ -2576,7 +2525,7 @@ MESSAGE cCompany '-' cFormId '-' htt::FormId.
|
|
|
|
|
|
|
|
DESTRUCTOR PUBLIC addressprogsHandler ( ):
|
|
DESTRUCTOR PUBLIC addressprogsHandler ( ):
|
|
|
|
|
|
|
|
- // DELETE OBJECT ttJsonIdent NO-ERROR.
|
|
|
|
|
|
|
+ DELETE OBJECT ttJsonIdent NO-ERROR.
|
|
|
|
|
|
|
|
END DESTRUCTOR.
|
|
END DESTRUCTOR.
|
|
|
|
|
|