diff --git a/docker/docker-compose-dev.yaml b/docker/docker-compose-dev.yaml index 654d436..bf62cff 100644 --- a/docker/docker-compose-dev.yaml +++ b/docker/docker-compose-dev.yaml @@ -34,10 +34,11 @@ services: OCR_SERVICE_MODE: "MODEL" #OCR_STRATEGY: "NO_OCR, OCR_ONLY, OCR_AND_TEXT_EXTRACTION, AUTO (default)" OCR_STRATEGY: "AUTO" + # Collabora integration WOPI_PUBLIC_ENDPOINT: "http://localhost:9980" WOPI_DISCOVERY_ENDPOINT: "http://collabora:9980/hosting/discovery" - WOPI_HOST_ENDPOINT: "http://imixs-documents:8080/api/wopi/" + WOPI_HOST_ENDPOINT: "http://app:8080/api/wopi/" COLLABORA_CONVERTER_URL: "http://collabora:9980/lool/convert-to/" # Imixs-AI @@ -103,20 +104,20 @@ services: ####################### # collabora Office Online ####################### - # collabora: - # image: collabora/code:23.05.0.5.1 - # #expose: - # # - 9980 - # ports: - # - "9980:9980" - # environment: - # - username=admin - # - password=adminadmin - # - extra_params=--o:ssl.enable=false - # - aliasgroup1=http://imixs-documents:8080 - # volumes: - # - ./configuration/collabora/fonts:/usr/share/fonts/truetype/more/ - # - ./configuration/collabora/fonts:/opt/cool/systemplate/usr/share/fonts/truetype/more/ + collabora: + image: collabora/code:23.05.0.5.1 + #expose: + # - 9980 + ports: + - "9980:9980" + environment: + - username=admin + - password=adminadmin + - extra_params=--o:ssl.enable=false + - aliasgroup1=http://app:8080 + # volumes: + # - ./configuration/collabora/fonts:/usr/share/fonts/truetype/more/ + # - ./configuration/collabora/fonts:/opt/cool/systemplate/usr/share/fonts/truetype/more/ ####################### # Imixs Admin Client diff --git a/docker/docker-compose-keycloak.yaml b/docker/docker-compose-keycloak.yaml index 9ec8745..8f2d7b0 100644 --- a/docker/docker-compose-keycloak.yaml +++ b/docker/docker-compose-keycloak.yaml @@ -120,7 +120,7 @@ services: - username=admin - password=adminadmin - extra_params=--o:ssl.enable=false - - aliasgroup1=http://imixs-documents:8080 + - aliasgroup1=http://app:8080 volumes: - ./configuration/collabora/fonts:/usr/share/fonts/truetype/more/ - ./configuration/collabora/fonts:/opt/cool/systemplate/usr/share/fonts/truetype/more/ diff --git a/pom.xml b/pom.xml index a5d3131..fba8ceb 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,7 @@ 1.0.1-SNAPSHOT 5.1.5-SNAPSHOT 5.0.3 - 3.0.1 + 3.2.1-SNAPSHOT 1.1.3-SNAPSHOT 1.0.0-SNAPSHOT 1.0.0 diff --git a/workflow/framework-aggreement-en-1.0.0.bpmn b/workflow/framework-aggreement-en-1.0.0.bpmn new file mode 100644 index 0000000..57b29f4 --- /dev/null +++ b/workflow/framework-aggreement-en-1.0.0.bpmn @@ -0,0 +1,546 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + + + + + task_6Rvbrg + task_htD1AQ + event_zUD3jQ + event_FrL0EA + event_06dF0Q + event_xW07Ug + event_D00leQ + gateway_4U3ZjA + event_GVwcdA + dataObject_0jfMhA + event_0TmpPA + event_U6M8lw + + + + event_jdHseQ + event_nmbHpg + task_sz0cKg + gateway_BqjeNQ + + + + task_k5bMQQ + + + + + sequenceFlow_IPSgCg + + + + + sequenceFlow_IPSgCg + sequenceFlow_ftfnGg + sequenceFlow_cGrlYQ + sequenceFlow_Bsyk0Q + sequenceFlow_0AMIqg + + + + + + + + + + + sequenceFlow_02i9iQ + sequenceFlow_M9MRGw + sequenceFlow_l3F8tQ + + + + + + + + + + + http://collabora:9980/lool/convert-to/ +$created-sequencenumber.docx +pdf]]> + + + + sequenceFlow_t4LJUg + sequenceFlow_M9MRGw + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +]]> + + + + + + + + + + + false + + true + llm.service.endpoint + request.reminder.text +]]> + + + + association_SDkT5A + sequenceFlow_zGFeYA + sequenceFlow_9jTAFA + + + + + + + + sequenceFlow_M9MRGw + sequenceFlow_usZTeg + sequenceFlow_d4R0mQ + sequenceFlow_9jTAFA + sequenceFlow_wVsGfw + + + + sequenceFlow_9jTAFA + sequenceFlow_usZTeg + + + + + + + + + sequenceFlow_02i9iQ + sequenceFlow_jHW2yQ + sequenceFlow_zGFeYA + + + + sequenceFlow_wVsGfw + + + + + + + + + + + + sequenceFlow_XB22VQ + sequenceFlow_jHW2yQ + + + + + + + + + + + + + sequenceFlow_l3F8tQ + sequenceFlow_XB22VQ + sequenceFlow_c30Xwg + + + + + + + + + + + + + + + sequenceFlow_c30Xwg + sequenceFlow_ftfnGg + + + + + + + + + + + + + sequenceFlow_0AMIqg + sequenceFlow_t4LJUg + sequenceFlow_jWWfuw + + + + + + + + + + + + + + + template-framework-aggreement + $created-sequencenumber.docx + true +]]> + + + + sequenceFlow_jWWfuw + sequenceFlow_X9JlJA + + + + + + + + + + + + + sequenceFlow_cGrlYQ + + + + + + + + + + + + + + $created-sequencenumber.docx + + [NUMBER] + sequencenumber + + + [DATE] + $modified + + + [Customer Company Name] + customer.company.name +]]> + + + + sequenceFlow_X9JlJA + sequenceFlow_Bsyk0Q + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/workflow/templates/sales-assist-en-1.0.0.bpmn b/workflow/templates/sales-assist-en-1.0.0.bpmn index a0cea9b..1e43922 100644 --- a/workflow/templates/sales-assist-en-1.0.0.bpmn +++ b/workflow/templates/sales-assist-en-1.0.0.bpmn @@ -2,7 +2,7 @@ - + diff --git a/workflow/templates/template-framework-agreement.docx b/workflow/templates/template-framework-agreement.docx new file mode 100644 index 0000000..24d676b Binary files /dev/null and b/workflow/templates/template-framework-agreement.docx differ diff --git a/workflow/templates/template-framework-agreement.odt b/workflow/templates/template-framework-agreement.odt new file mode 100644 index 0000000..9e7c48d Binary files /dev/null and b/workflow/templates/template-framework-agreement.odt differ