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

Releases/1.8.3 #137

Merged
merged 150 commits into from
Jul 11, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
150 commits
Select commit Hold shift + click to select a range
bf7b495
init
lakhoune May 16, 2022
68029a8
wip #119
lakhoune May 23, 2022
7bd612f
req to qvs done
lakhoune May 23, 2022
952adf0
update path
lakhoune May 23, 2022
53fc5ca
rename body
lakhoune May 24, 2022
8c6cb6e
handle unsuccessfull response
lakhoune May 24, 2022
ac7ae5b
fix survey field width
lakhoune May 24, 2022
2e004fe
split surveys as current and past in view
lakhoune May 24, 2022
665704d
use ngrxstore for selecting the surveys
lakhoune May 24, 2022
48ad74b
add test survey to test
lakhoune May 24, 2022
693dc2f
styling
lakhoune May 24, 2022
8aa875e
parse iso dates
lakhoune May 24, 2022
0667549
fix selector for model being undefined case
lakhoune May 24, 2022
9182bda
disable manual date input in favor of datepicker
lakhoune May 24, 2022
ca284ce
close #119
lakhoune May 26, 2022
86e2ccd
bump version
lakhoune May 26, 2022
b87a32c
Merge commit '86e2ccd694207b0f823160482d26496e92246bfa' into releases…
lakhoune May 26, 2022
5e03a57
Merge branch 'releases/1.9.0' into develop
lakhoune May 26, 2022
d57a027
Revert "Merge branch 'releases/1.9.0' into develop"
lakhoune May 26, 2022
42d6102
use observable
lakhoune May 28, 2022
f609fb9
´fixes for qv component
lakhoune May 30, 2022
7b5eaf5
fix multiple observable callbacks being caused by late subscribers
lakhoune May 31, 2022
25f59c6
fix observable for late subscribers
lakhoune May 31, 2022
9814966
[ENH] Move sql query preparation to effects
lakhoune May 31, 2022
6f239ab
#126
lakhoune May 31, 2022
c1bec4a
fix loading for value component #129
lakhoune May 31, 2022
1632b2e
fix loading for chart component #129
lakhoune May 31, 2022
95bf9d2
remove lifecycle method
lakhoune May 31, 2022
8ed6de7
#129
lakhoune May 31, 2022
1523bd9
fix lint
lakhoune May 31, 2022
3dadf8f
Merge branch 'develop' into lakhoune/issue126
lakhoune May 31, 2022
dda10e9
Merge pull request #130 from rwth-acis/lakhoune/issue126
AlexanderNeumann Jun 1, 2022
487fff5
Merge branch 'develop' into limesurvey
lakhoune Jun 8, 2022
ba28e1b
add requests handlers for surveys and responses for testing
lakhoune Jun 9, 2022
b7bb994
rename interace for measure, implement class for Limesurvey measure
lakhoune Jun 9, 2022
19f42a0
add interfaces for responses from limesruvey proxy
lakhoune Jun 9, 2022
dd0709f
add implementation for fromXML function
lakhoune Jun 9, 2022
b31d481
add limesurvey proxy url to env
lakhoune Jun 9, 2022
bae3e25
clean
lakhoune Jun 9, 2022
a0bc1af
fix interface import
lakhoune Jun 9, 2022
e1fe81f
add actions for limesurvey
lakhoune Jun 9, 2022
d08ffee
add http calls for limesurvey
lakhoune Jun 9, 2022
82adf33
add effect to fetch limesurvey surveys
lakhoune Jun 9, 2022
6ff5a14
implement effect for fetching limesurvey responses
lakhoune Jun 9, 2022
18e6dce
update state for limesurvey
lakhoune Jun 9, 2022
2241369
add prop
lakhoune Jun 9, 2022
2868b88
add reducer impl. for limesurvey
lakhoune Jun 9, 2022
e8776b2
make limesurvey inherit from survey interface
lakhoune Jun 9, 2022
5882c9a
update classes for limesurvey
lakhoune Jun 9, 2022
fbb7903
type check
lakhoune Jun 9, 2022
c3aecd0
#131
lakhoune Jun 9, 2022
bebb26a
move dataprep to success measure component
lakhoune Jun 9, 2022
00a4c77
clean
lakhoune Jun 9, 2022
b295ac1
remove data fetch from visualization components
lakhoune Jun 9, 2022
d9531f5
remove class inheritance
lakhoune Jun 9, 2022
97ea6a8
fixes
lakhoune Jun 9, 2022
73c6d01
add cors
lakhoune Jun 9, 2022
e6f4303
app config
lakhoune Jun 9, 2022
8709b53
uncomment
lakhoune Jun 9, 2022
508203e
closes #131
lakhoune Jun 9, 2022
4157672
Merge branch 'issues/131' into limesurvey
lakhoune Jun 9, 2022
b6d0d27
add search for surveys
lakhoune Jun 10, 2022
d4ff649
survey selector now also returns surveys from limesurvey
lakhoune Jun 10, 2022
52b6192
adjust state model to accept all surveys implementing the survey inte…
lakhoune Jun 10, 2022
dba736b
fix constructor for limesurvey survey
lakhoune Jun 10, 2022
00e5fe9
transform survey response into correct object
lakhoune Jun 10, 2022
463b549
fix type
lakhoune Jun 10, 2022
c519856
type return value
lakhoune Jun 10, 2022
5f6b672
update route for angular proxy
lakhoune Jun 10, 2022
2a4dc40
show panel on init
lakhoune Jun 10, 2022
52ff829
only show open in mobsos surveys button if survey is from mobsos surveys
lakhoune Jun 10, 2022
9368686
get surveyresponses on limesurvey select
lakhoune Jun 10, 2022
daf1b0a
create limesurvey measure component
lakhoune Jun 10, 2022
0558178
add yes no type
lakhoune Jun 10, 2022
94f0ac2
wip
lakhoune Jun 10, 2022
f97b2b3
measures from limesurvey can now be added to model in workspace
lakhoune Jun 10, 2022
8df3beb
fix wrong type cast
lakhoune Jun 10, 2022
4f480eb
update component
lakhoune Jun 10, 2022
cb63fea
wip
lakhoune Jun 11, 2022
3cbe02d
[ENH] implement limesurvey component #133
lakhoune Jun 11, 2022
c68788c
add button and action
lakhoune Jun 11, 2022
a6a2250
closes #133
lakhoune Jun 11, 2022
d93f0be
Merge branch 'issues/133' into limesurvey
lakhoune Jun 11, 2022
4c2f60a
fix survey id missing in measure
lakhoune Jun 11, 2022
1ada7e3
close #96
lakhoune Jun 11, 2022
ad1045c
close #133
lakhoune Jun 11, 2022
97a51df
close #131
lakhoune Jun 11, 2022
83aa69c
fix preview panel for limesurvey measure
lakhoune Jun 11, 2022
1b74c6e
add type check
lakhoune Jun 11, 2022
6ad1f49
display measure name as html
lakhoune Jun 11, 2022
2da0d20
add survey type to interface
lakhoune Jun 11, 2022
48af44b
fix selector
lakhoune Jun 11, 2022
9da6ba6
refetch survey responses if success model changes
lakhoune Jun 11, 2022
5979cf0
only fetch if diff between now and last req is greater than the refet…
lakhoune Jun 11, 2022
641deec
remove log
lakhoune Jun 12, 2022
9cf4d41
fix type checks
lakhoune Jun 12, 2022
ae5d62f
fix type
lakhoune Jun 12, 2022
0cfa007
fix effect
lakhoune Jun 12, 2022
d8dc8e5
catch type check exception when saving model
lakhoune Jun 12, 2022
6186652
fix peer deps issue in workflow
lakhoune Jun 12, 2022
17232f6
lint
lakhoune Jun 12, 2022
817c525
add missing import
lakhoune Jun 12, 2022
3d30e45
Merge remote-tracking branch 'origin/master' into limesurvey
lakhoune Jun 12, 2022
631c8fe
force dependency
lakhoune Jun 12, 2022
e3cdfd6
fix syntax
lakhoune Jun 12, 2022
d17a7bf
prevent proxy crash
lakhoune Jun 12, 2022
8371460
null checks
lakhoune Jun 12, 2022
2dda327
add type to survey xml
lakhoune Jun 12, 2022
062e64b
fix getAttribute
lakhoune Jun 12, 2022
9b18d69
fix tests
lakhoune Jun 12, 2022
2bff43b
tests fixed
lakhoune Jun 12, 2022
562a9d3
fix all tests
lakhoune Jun 12, 2022
c3a19d7
add check if limesurvey proxy is available
lakhoune Jun 13, 2022
789c95b
Merge pull request #134 from rwth-acis/limesurvey
AlexanderNeumann Jun 14, 2022
f2bb659
fix url for qvs
lakhoune Jun 14, 2022
4c7eced
quick fix
lakhoune Jun 14, 2022
1292268
add check for backend availability
lakhoune Jun 14, 2022
00c13d5
clean-up proxy
lakhoune Jun 14, 2022
900993f
remove empty strings in pathpart
lakhoune Jun 14, 2022
23150e6
add test
lakhoune Jun 14, 2022
0032c06
css
lakhoune Jun 14, 2022
b351868
closes #135
lakhoune Jun 15, 2022
87d1bae
try fix
lakhoune Jun 15, 2022
b3c5fb8
clean
lakhoune Jun 15, 2022
3345a7d
exclude node modules from tscheck
lakhoune Jun 15, 2022
d5d35a9
Factor is deleted when query is changed
lakhoune Jun 25, 2022
390071c
reduce tsserver files
lakhoune Jun 25, 2022
3fc67db
directly go to issues category when clicking link
lakhoune Jun 25, 2022
3b73516
typecheck
lakhoune Jun 25, 2022
fe4fa27
clean
lakhoune Jun 25, 2022
da8a781
add type to measure interface to distinguish between success measure …
lakhoune Jun 25, 2022
b75728e
Merge branch 'lakhoune/issue136' into develop
lakhoune Jun 25, 2022
7866b24
typecheck for error message
lakhoune Jun 26, 2022
2690376
replace special html chars in sql query
lakhoune Jun 26, 2022
896690c
fetch model and catalog on init of query visualizer
lakhoune Jun 27, 2022
49f5362
fix encoding and decoding of query xml
lakhoune Jun 27, 2022
1ca003e
bump version
lakhoune Jun 27, 2022
747e5ad
add matmenu module in test file
lakhoune Jun 27, 2022
a38d4b1
add tests for query.fromXML and query.toXML
lakhoune Jun 28, 2022
c9bafb6
update req baz link
lakhoune Jun 28, 2022
3de3b96
adjust http request to survey handler service
lakhoune Jul 10, 2022
4bb11bd
adjust type
lakhoune Jul 10, 2022
da8e366
adjust callls to surveyhandler service proxy
lakhoune Jul 10, 2022
a828d44
add limesurvey credentials to env
lakhoune Jul 10, 2022
f84c29f
create template file for local development
lakhoune Jul 10, 2022
9883a4d
adjust env model to use window env variables
lakhoune Jul 10, 2022
8766d54
update model names
lakhoune Jul 10, 2022
304964b
adjust env.template
lakhoune Jul 10, 2022
6a45883
Merge remote-tracking branch 'origin/master' into releases/1.8.3
lakhoune Jul 10, 2022
4975921
update env to use proxy in cluster
lakhoune Jul 10, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@
"files": [
"*.ts"
],
"env": {
"es6": true
},
"parserOptions": {
"ecmaVersion": 2017,
"project": [
"tsconfig.json"
],
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Install node-modules
run: npm i --force
- name: Lint
run: npm i && npm run lint
run: npm run lint
run-tests:
runs-on: ubuntu-latest
steps:
Expand All @@ -20,7 +22,7 @@ jobs:
with:
node-version: 16.x
- name: Setup
run: npm i
run: npm i --force
- name: Test
run: |
npm run test-headless
npm run test-headless
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,7 @@ Thumbs.db
.vscode/launch.json
yjs-websocket/node_modules/
src/assets/monaco/*
.vscode/settings.json
limesurvey-proxy/node_modules
limesurvey-proxy/.env
.vscode/settings.json
src/app/models/.env.ts
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ FROM node:16-alpine AS app-build
WORKDIR /app
COPY . .

RUN npm ci && npm run build:prod
RUN npm ci --force && npm run build:prod

# stage 2
FROM nginx:alpine
Expand Down
14 changes: 14 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,20 @@ The following variables need to be configured:
| reqBazFrontendUrl | Url a which the Requirements Bazar frontend is accessible |
| production | Set this to true for the production build. If this is set to false then experimental features are enabled |

### env.ts

The SurveyHanlder service requires you to provide the credentials for connecting to the limesurvey instance. As these credentials should not be exposed on Github, you have to add them yourself. To do this, navigate to the `src\app\models` folder. In there, there should be a file called `env.ts.template`. Copy this file and rename it as ``env.ts``. The file should look like this:

```ts
export const cred = {
limeSurveyUrl: '',
loginName: '',
loginPassword: '',
};
```

Adjust the properties accordingly.

# Working with Angular

## Development server
Expand Down
3 changes: 3 additions & 0 deletions limesurvey-proxy/.env.template
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
LIMESURVEY_USERNAME=
LIMESURVEY_PASSWORD=
LIMESURVEY_HOST=
16 changes: 16 additions & 0 deletions limesurvey-proxy/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Limesurvey proxy

Simple limesurvey proxy.

## Installation

Make sure nodejs is installed. Rename the ``.env.template`` to `.env` and adjust the properties.
Run:

```bash
npm i
```

## Proxy

Now, run `npm run start` and visit `http://localhost:3000`
Loading