Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Proposed changes #372

Open
wants to merge 94 commits into
base: development
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
94 commits
Select commit Hold shift + click to select a range
ebc29e3
language builds with new freon
globallyunique Jul 1, 2024
76f6939
removed junk from gitignore
globallyunique Jul 1, 2024
a9cfa8e
wip on making handler work
globallyunique Jul 1, 2024
b6630f7
updates to all the demo and test apps so build works
globallyunique Jul 2, 2024
f8208bc
build works with ExBaseBoxProvider references commented out of parser…
globallyunique Jul 2, 2024
fc479f9
switched to studyconfiguration
gmcgibbon-triradial Jul 2, 2024
39262e7
wip trying to get tests working
globallyunique Jul 2, 2024
3ca8ddc
wip run only one test
globallyunique Jul 2, 2024
21e89d1
fixed capitalization problem
globallyunique Jul 3, 2024
bd1b824
clean up after accidental generation of .js versions of .ts files. So…
globallyunique Jul 3, 2024
d7cf49f
tests run again
globallyunique Jul 3, 2024
e7d6335
fixed test running old code so tests pass
globallyunique Jul 3, 2024
07d06ec
tests wip
globallyunique Jul 5, 2024
1786e16
subset of the period on timeline tests work
globallyunique Jul 10, 2024
b1d84ee
all tests pass with addition of periods to timeline
globallyunique Jul 10, 2024
4bd0774
Merge remote-tracking branch 'upstream/development' into development
globallyunique Jul 10, 2024
7557a2b
merged changes
globallyunique Jul 10, 2024
8bcc6d2
fixed tsconfig so webapp would start
globallyunique Jul 10, 2024
581f5b1
UI/UX changes
gmcgibbon-triradial Jul 10, 2024
22d2b85
Generated basic timeline
globallyunique Jul 10, 2024
c519065
timeline test passes
globallyunique Jul 10, 2024
7680e01
Merge branch 'development' of https://github.com/triradial/Freon4dsl …
gmcgibbon-triradial Jul 11, 2024
73577a4
Formatting Changes
gmcgibbon-triradial Jul 11, 2024
d11a570
chart with multiple phases test passes
globallyunique Jul 11, 2024
f3ecb91
Merge branch 'development' of https://github.com/triradial/Freon4dsl …
globallyunique Jul 11, 2024
29ee5ef
start of language simplification
globallyunique Jul 11, 2024
4f0ded5
Merge branch 'development' of https://github.com/triradial/Freon4dsl …
gmcgibbon-triradial Jul 11, 2024
308555f
new iconbox
gmcgibbon-triradial Jul 11, 2024
8817cf6
Merge branch 'development' of https://github.com/triradial/Freon4dsl …
gmcgibbon-triradial Jul 11, 2024
4410dd9
wip on AST
globallyunique Jul 12, 2024
52accde
Merge remote-tracking branch 'upstream/development' into development
globallyunique Jul 12, 2024
5f15c78
formatting changes
gmcgibbon-triradial Jul 15, 2024
8c1184a
correct layout for panel
gmcgibbon-triradial Jul 15, 2024
e38f390
more formatting changes
gmcgibbon-triradial Jul 15, 2024
ac35f56
updates for expressions
globallyunique Jul 15, 2024
2ff296c
Merge branch 'development' of https://github.com/triradial/Freon4dsl …
globallyunique Jul 15, 2024
5f3f922
fixes to build
globallyunique Jul 15, 2024
b3b6069
fix example layout
gmcgibbon-triradial Jul 15, 2024
e277d7f
Merge branch 'development' of https://github.com/triradial/Freon4dsl …
gmcgibbon-triradial Jul 15, 2024
91d7884
fix liternal number display
globallyunique Jul 15, 2024
5491b9a
Merge branch 'development' of https://github.com/triradial/Freon4dsl …
gmcgibbon-triradial Jul 15, 2024
21f98ef
periods optionally hidden
globallyunique Jul 15, 2024
961297c
show scheduling and events-without-periods works in UI
globallyunique Jul 16, 2024
a99957d
add csClass to several key boxes
gmcgibbon-triradial Jul 16, 2024
0680873
Merge branch 'development' of https://github.com/triradial/Freon4dsl …
gmcgibbon-triradial Jul 16, 2024
9ff253d
layout fixes
gmcgibbon-triradial Jul 16, 2024
e6c83c0
add line heights
gmcgibbon-triradial Jul 16, 2024
54ff6b5
Start of hiding checklist column
globallyunique Jul 16, 2024
c0413f6
Merge branch 'development' of https://github.com/triradial/Freon4dsl …
globallyunique Jul 16, 2024
c96f656
Merge remote-tracking branch 'upstream/development' into development
globallyunique Jul 16, 2024
a422e62
Show systems fixed
globallyunique Jul 16, 2024
37300eb
Merge remote-tracking branch 'upstream/development' into development
globallyunique Jul 16, 2024
3f7105f
wip
globallyunique Jul 16, 2024
6efcb14
added tinymce
gmcgibbon-triradial Jul 16, 2024
aca9760
Merge branch 'development' of https://github.com/triradial/Freon4dsl …
gmcgibbon-triradial Jul 16, 2024
9615d73
wip
globallyunique Jul 17, 2024
312dfc4
Merge branch 'development' of https://github.com/triradial/Freon4dsl …
globallyunique Jul 17, 2024
03fdd72
tinymce update
gmcgibbon-triradial Jul 17, 2024
5b7548c
Merge branch 'development' of https://github.com/triradial/Freon4dsl …
gmcgibbon-triradial Jul 17, 2024
57be83a
cleanups for demo
globallyunique Jul 17, 2024
e7ad2b8
Merge branch 'development' of https://github.com/triradial/Freon4dsl …
globallyunique Jul 17, 2024
0a5d507
resolved merge issue with custom projection
globallyunique Jul 17, 2024
23f2487
hopefully demo working again
globallyunique Jul 17, 2024
c495c00
fixed layout issues
gmcgibbon-triradial Jul 17, 2024
2ba2775
setting group default state
gmcgibbon-triradial Jul 17, 2024
11f18d7
added item group, fixed list group, fixed drag-n-drop
gmcgibbon-triradial Jul 18, 2024
46057dd
fix itemgroupcomponent2
gmcgibbon-triradial Jul 18, 2024
5a342f4
wip
globallyunique Jul 18, 2024
dce8125
Merge branch 'development' of https://github.com/triradial/Freon4dsl …
globallyunique Jul 18, 2024
ded7240
Merge branch 'development' of https://github.com/triradial/Freon4dsl …
gmcgibbon-triradial Jul 18, 2024
12f887f
patient timeline updated
globallyunique Jul 20, 2024
a3a1884
Added patient and staffing to DSL as new unit
globallyunique Jul 21, 2024
76548df
updates to the availability editor
globallyunique Jul 22, 2024
24b8894
timeline updates
globallyunique Jul 22, 2024
78b407d
Auto-create model and units
globallyunique Jul 24, 2024
23194d1
Save of all units works
globallyunique Jul 24, 2024
f716a3b
draw open by default
globallyunique Jul 24, 2024
d3f2074
fixed mistake in unit selection
globallyunique Jul 24, 2024
5cfa1dc
wip
globallyunique Jul 25, 2024
fb42309
Component updates
gmcgibbon-triradial Jul 26, 2024
88e7942
Merge branch 'development' of https://github.com/triradial/Freon4dsl …
gmcgibbon-triradial Jul 26, 2024
b6f80a9
various layout and style changes
gmcgibbon-triradial Jul 29, 2024
fa9b95f
Merge branch 'development' of https://github.com/triradial/Freon4dsl …
globallyunique Jul 29, 2024
a15931c
layout fixes
gmcgibbon-triradial Jul 29, 2024
05ccf53
Merge branch 'development' of https://github.com/triradial/Freon4dsl …
gmcgibbon-triradial Jul 29, 2024
fafd8f6
new version of checklist minimally working
globallyunique Jul 30, 2024
07b3d7f
Merge branch 'development' of https://github.com/triradial/Freon4dsl …
globallyunique Jul 30, 2024
97df579
minimal show details working
globallyunique Jul 31, 2024
34100a9
task expands minimally working.
globallyunique Jul 31, 2024
557ee7f
minimal copy to shared task works
globallyunique Jul 31, 2024
3108613
WIP so Jos might look at it
globallyunique Jul 31, 2024
47e4181
Merge remote-tracking branch 'upstream/development' into development
globallyunique Aug 1, 2024
d1c9f46
merged
globallyunique Aug 1, 2024
a2777eb
for pull request with study config removed
globallyunique Aug 1, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 8 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ yarn-debug.log
yarn-error.log

# generated docs
docs/*
# docs/*
# /docs/

# generated files
gen/
Expand Down Expand Up @@ -68,7 +69,6 @@ packages/meta/src/languagedef/__tests__/language-tests/correctDefFiles/internal-

/packages/test/src/testDefinedScoper/defs/Language.ast
/packages/test/src/testDefinedScoper/__tests__/ModelCreator.ts
/docs/
/packages/server/modelstore-example/APEKOOL/
/packages/server/modelstore-example/EMPTY-MODEL/
/packages/server/modelstore-example/ExtraModel/
Expand All @@ -84,3 +84,9 @@ packages/meta/src/languagedef/__tests__/language-tests/correctDefFiles/internal-
/packages/server/modelstore-example/www/
/packages/webapp-lib/.svelte-kit/
/packages/core-svelte/.svelte-kit/

*storybook.log
packages/server/modelstore/x/Availability.json
packages/server/modelstore/x/AvailabilityPublic.json
packages/server/modelstore/x/StudyConfiguration.json
packages/server/modelstore/x/StudyConfigurationPublic.json
260 changes: 260 additions & 0 deletions E1.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,260 @@
# TASK WEBFORM - E1
langcode: en
status: open
dependencies: { }
weight: 0
open: null
close: null
uid: 1
template: false
archive: false
id: freId() {
return this.$id;
}
title: E1
description: ''
categories:
- Task
elements: |-
placeholder_for_expand_collapse:
'#type': details
'#title': placeholder_for_expand_collapse
'#title_display': invisible
'#states':
invisible:
- ':input[name="step_1"]':
checked: true
- or
- ':input[name="step_1"]':
unchecked: true
'#access_create_roles':
- authenticated
'#access_update_roles':
- authenticated
'#access_view_roles':
- authenticated
<#list steps?values as step>
step_0:
'#type': checkbox
'#title': 'Step 0 - T1'
'#wrapper_attributes':
class:
- step-header
step0_details:
'#type': details
'#title': Details
'#title_display': invisible
'#attributes':
class:
- step-content
step0_instructions:
'#type': processed_text
'#text': '<div id="container" class="step-detail"><div id="definition" class="step-detail-definition"><ul><li>null</li></ul></div></div>'
'#format': full_html
submit_buttons:
'#type': webform_flexbox
complete:
'#type': webform_actions
'#title': 'Complete Now'
'#flex': 0
'#attributes':
class:
- task-primary-button
'#submit__label': 'Complete Now'
'#update__label': 'Complete Now'
complete_later:
'#type': webform_actions
'#title': 'Complete Later'
'#flex': 0
'#attributes':
class:
- task-secondary-button
'#submit__label': 'Complete Later'
'#update__label': 'Complete Later'
css: ''
javascript: ''
settings:
ajax: false
ajax_scroll_top: form
ajax_progress_type: ''
ajax_effect: ''
ajax_speed: null
page: true
page_submit_path: ''
page_confirm_path: ''
page_theme_name: ''
form_title: source_entity_webform
form_submit_once: true
form_open_message: ''
form_close_message: ''
form_exception_message: ''
form_previous_submissions: false
form_confidential: false
form_confidential_message: ''
form_disable_remote_addr: false
form_convert_anonymous: false
form_prepopulate: false
form_prepopulate_source_entity: false
form_prepopulate_source_entity_required: false
form_prepopulate_source_entity_type: ''
form_unsaved: false
form_disable_back: true
form_submit_back: false
form_disable_autocomplete: false
form_novalidate: false
form_disable_inline_errors: false
form_required: false
form_autofocus: false
form_details_toggle: false
form_reset: false
form_access_denied: default
form_access_denied_title: ''
form_access_denied_message: ''
form_access_denied_attributes: { }
form_file_limit: ''
form_attributes: { }
form_method: ''
form_action: ''
share: false
share_node: false
share_theme_name: ''
share_title: true
share_page_body_attributes: { }
submission_label: ''
submission_exception_message: ''
submission_locked_message: ''
submission_log: false
submission_excluded_elements: { }
submission_exclude_empty: false
submission_exclude_empty_checkbox: false
submission_views: { }
submission_views_replace: { }
submission_user_columns: { }
submission_user_duplicate: false
submission_access_denied: default
submission_access_denied_title: ''
submission_access_denied_message: ''
submission_access_denied_attributes: { }
previous_submission_message: ''
previous_submissions_message: ''
autofill: false
autofill_message: ''
autofill_excluded_elements: { }
wizard_progress_bar: true
wizard_progress_pages: false
wizard_progress_percentage: false
wizard_progress_link: false
wizard_progress_states: false
wizard_start_label: ''
wizard_preview_link: false
wizard_confirmation: true
wizard_confirmation_label: ''
wizard_auto_forward: true
wizard_auto_forward_hide_next_button: false
wizard_keyboard: true
wizard_track: ''
wizard_prev_button_label: ''
wizard_next_button_label: ''
wizard_toggle: false
wizard_toggle_show_label: ''
wizard_toggle_hide_label: ''
wizard_page_type: container
wizard_page_title_tag: h2
preview: 0
preview_label: ''
preview_title: ''
preview_message: ''
preview_attributes: { }
preview_excluded_elements: { }
preview_exclude_empty: true
preview_exclude_empty_checkbox: false
draft: none
draft_multiple: false
draft_auto_save: false
draft_saved_message: ''
draft_loaded_message: ''
draft_pending_single_message: ''
draft_pending_multiple_message: ''
confirmation_type: page
confirmation_url: ''
confirmation_title: ''
confirmation_message: ''
confirmation_attributes: { }
confirmation_back: true
confirmation_back_label: ''
confirmation_back_attributes: { }
confirmation_exclude_query: false
confirmation_exclude_token: false
confirmation_update: false
limit_total: null
limit_total_interval: null
limit_total_message: ''
limit_total_unique: false
limit_user: null
limit_user_interval: null
limit_user_message: ''
limit_user_unique: false
entity_limit_total: null
entity_limit_total_interval: null
entity_limit_user: null
entity_limit_user_interval: null
purge: none
purge_days: null
results_disabled: false
results_disabled_ignore: false
results_customize: false
token_view: false
token_update: false
token_delete: false
serial_disabled: false
access:
create:
roles:
- authenticated
users: { }
permissions: { }
view_any:
roles:
- authenticated
users: { }
permissions: { }
update_any:
roles:
- authenticated
users: { }
permissions: { }
delete_any:
roles:
- authenticated
users: { }
permissions: { }
purge_any:
roles: { }
users: { }
permissions: { }
view_own:
roles: { }
users: { }
permissions: { }
update_own:
roles: { }
users: { }
permissions: { }
delete_own:
roles: { }
users: { }
permissions: { }
administer:
roles: { }
users: { }
permissions: { }
test:
roles: { }
users: { }
permissions: { }
configuration:
roles: { }
users: { }
permissions: { }
handlers: { }
variants: { }
24 changes: 20 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ Setup the multirepo and install all dependencies:

Now you can build Freon with:
```bash
cd Freon4dsl
npm run build
```

Expand All @@ -38,24 +39,39 @@ And run all tests with:
```

## Starting the web app editor
* Go to the package containing your language, this can e.g. be any package in `packages/samples`.
- Build the language using `npm run build`
* Go to the package containing your language, this can e.g. be any package and build the language. if you make changes to language then also do this run build
```bash
cd Freon4dsl/packages/samples/StudyConfiguration
npm run build
```

* Go to the `webapp-starter` package.
- Open the file `package.json
- In the _dependencies_ section change the language dependency to your chosen language
- Also open the file `src/starter.ts`
- Change lines 7 and 8 to import the correct environment from your chosen language package.

* Go to directory `packages/core-svelte` and build, and also if you make changes to the svelte components:
```bash
cd Freon4dsl/packages/core-svelte
npm run build
```

* Go to directory `packages/server` and start the server:
```bash
cd packages/server
cd Freon4dsl/packages/server
npm run start
```

* Goto the `webapp-lib` and build, and also ig you make changes to the core application
```bash
cd Freon4dsl/packages/webapp-lib
npm run build
```

* Goto the `webapp-starter` and start Freon:
```bash
cd packages/webapp-starter
cd Freon4dsl/packages/webapp-starter
npm run prepare-app
npm run dev
```
Expand Down
7 changes: 7 additions & 0 deletions babel.config.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
module.exports = {
presets: [
['@babel/preset-env', { targets: { node: 'current' } }],
'@babel/preset-typescript',
],
};

27 changes: 27 additions & 0 deletions docs/forking.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
How to get started with the fork of Freon4-dsl

To update a forked repository on GitHub, you need to fetch the changes from the original repository (upstream) and merge them into your fork. Here are the steps:

Open Terminal on your Mac.
Navigate to your local repository (the forked one).
Add the original repository as a remote repository:

> git remote add upstream https://github.com/freon4dsl/Freon4dsl.git

Fetch the branches and their commits from the upstream repository:
> git fetch upstream

Check out your fork's local default branch - usually main:

> git checkout development


Merge the changes from the upstream/main into your local main branch:

> git merge upstream/development


Push your updates to the forked repository on GitHub:

> git push origin development

4 changes: 4 additions & 0 deletions docs/location.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@


cd packages/samples/StudyConfiguration/src/defs
cd packages/core-svelte/src/lib/components
Loading