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

fixes #225 #226 #238 #265 #274 #352 #391

Merged
merged 49 commits into from
May 6, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
b0dbd86
#352 Textfield is out of place in firefox
ildacheu Feb 23, 2021
401b025
#352 Textfield is out of place in firefox
ildacheu Feb 23, 2021
819cdb6
proper fix for #274
ildacheu Feb 25, 2021
830a691
code reformat
ildacheu Feb 25, 2021
368b63f
supress warning from rubocop
ildacheu Feb 25, 2021
9a1e977
#265 fix active menupoint highlighting
ildacheu Feb 25, 2021
86bff4e
Bump elliptic from 6.5.3 to 6.5.4 in /frontend
dependabot[bot] Mar 9, 2021
50836ee
#238 add pagination for users and expense sheets
ildacheu Mar 16, 2021
e529b0a
#238 add pagination for users and expense sheets
ildacheu Mar 18, 2021
c67edce
#238 add pagination for users and expense sheets
ildacheu Mar 18, 2021
bbfc218
#238 add pagination for users and expense sheets
ildacheu Mar 18, 2021
52777c5
Merge pull request #384 from stiftungswo/238-pagination-users-expense…
ildacheu Mar 18, 2021
aac936c
total amount does not update after filter is changed
ildacheu Mar 18, 2021
7163ecf
#226 add option to set beginning of a service on a saturday
ildacheu Mar 18, 2021
b0a678f
#226 add option to set beginning of a service on a saturday
ildacheu Mar 18, 2021
b7d0a14
#226 add option to set beginning of a service on a saturday
ildacheu Mar 18, 2021
edef0c9
#226 add option to set beginning of a service on a saturday
ildacheu Mar 18, 2021
a0d9bbe
#226 add option to set beginning of a service on a saturday
ildacheu Mar 18, 2021
f90655b
#225 make new user in dime if new user registrates in izivi
ildacheu Mar 24, 2021
78a7dac
better installation guid for docker
ildacheu Mar 25, 2021
aa8fa4b
update mimemagic
ildacheu Mar 25, 2021
cd93adc
Merge branch 'develop' of github.com:stiftungswo/better-izivi into de…
ildacheu Mar 25, 2021
2abbf0b
Merge pull request #385 from stiftungswo/develop
ildacheu Mar 25, 2021
9916631
change uri to dime api
ildacheu Mar 25, 2021
ca2f01b
fix failing test
ildacheu Mar 26, 2021
a778cd4
Bump y18n from 3.2.1 to 3.2.2 in /frontend
dependabot[bot] Mar 30, 2021
137379f
fix failing tests
ildacheu Apr 8, 2021
b01152e
fix reek warnings
ildacheu Apr 8, 2021
c8683a6
Merge pull request #387 from stiftungswo/#225-make-user-in-dime-on-re…
ildacheu Apr 8, 2021
be6f8d7
adapt ENV comparison to string
ildacheu Apr 8, 2021
3a089a6
Merge branch 'develop' of github.com:stiftungswo/better-izivi into de…
ildacheu Apr 8, 2021
463a19f
#225 fix employee group and code clean up
ildacheu Apr 8, 2021
c5d0d62
Merge pull request #388 from stiftungswo/develop
ildacheu Apr 9, 2021
3d1ec8e
Merge pull request #386 from stiftungswo/dependabot/npm_and_yarn/fron…
ildacheu Apr 9, 2021
4ac0e6e
Merge pull request #383 from stiftungswo/dependabot/npm_and_yarn/fron…
ildacheu Apr 9, 2021
b74312f
Bump ssri from 6.0.1 to 6.0.2 in /frontend
dependabot[bot] Apr 20, 2021
1f200dd
#225 import sick days from Dime
ildacheu Apr 21, 2021
3cf5c46
#225 fix error handling when no user is found
ildacheu Apr 28, 2021
9818933
fix failing tests
ildacheu Apr 28, 2021
680a2dd
fix failing tests
ildacheu Apr 28, 2021
6af18ff
add env for api uri
ildacheu Apr 28, 2021
469cb92
Merge pull request #390 from stiftungswo/225-import-sick-days-from-dime
ildacheu Apr 28, 2021
3f0dc0e
Merge pull request #389 from stiftungswo/dependabot/npm_and_yarn/fron…
ildacheu Apr 28, 2021
3e06f99
#225 fix no method error
ildacheu Apr 29, 2021
9485e79
#225 componentDidMount is only called on reload
ildacheu Apr 30, 2021
5d58bbe
#225 add missing parameter for save_dime_id
ildacheu Apr 30, 2021
dabf9bb
update gems and dependencies
ildacheu May 5, 2021
39dd2b9
upgrade to react-intl 5.7.1
ildacheu May 6, 2021
08d5641
update gems
ildacheu May 6, 2021
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
13 changes: 9 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,15 @@ E: The payments contains the expenses in a payment-schedule. An XML can be gener

### Vorbereitung

#### Docker (geht am schnellsten und am einfachsten)

Wenn Docker noch nicht installiert: z.B [hier](https://www.docker.com/products/docker-desktop) herunterladen. Wichtig: Auf Linux muss docker-compose noch separat installiert werden.

1. Repo clonen und im neuen Verzeichnis wechseln
2. Dort `docker-compose up` ausführen
3. Die CLI des API-containers starten und dort `rails db:create`, `rails db:migrate` und `rails db:seed` ausführen (Zwei neue Datenbanken werden erschaffen und mit Daten gespiesen.)
4. Jetzt ist die Anmeldung mit [diesen](https://github.com/stiftungswo/better-izivi/tree/develop/api#seed-data) Zugangsdaten im Frontend möglich.

#### Homebrew für Mac

Fast jede Linux-Distribution wird mit einem Paketmanager ausgeliefert. Diese ermöglichen dir, bequem neue Programme zu installieren, ohne dazu eine aufwendige Installation durchführen zu müssen. Unter Mac hat die Community homebrew entwickelt, um einen solchen Paketmanager auf Mac bereitzustellen.
Expand All @@ -136,10 +145,6 @@ Ruby wird einfacherweise mit [rbenv](https://github.com/rbenv/rbenv) installiert
5. `rbenv install`
6. `gem install bundler`

#### Docker

Installation gemäss der Installationsanleitung auf der [Website](https://docs.docker.com/install/) durchführen. Wichtig: Für manche Betriebssysteme muss docker-compose noch separat installiert werden.

### Backend

1. Ins Verzeichnis des betterIzivi wechseln (z.B. cd ``~/src/swo/better-izivi/api``)
Expand Down
3 changes: 3 additions & 0 deletions api/.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,6 @@ FEEDBACK_MAIL_GOOGLE_REVIEW_URL="https://g.page/r/Ceus2ke10hBiEAg/review"


PASSWORD_RESET_LINK="e.g. http://izivi.localhost:3000/users/passwords/edit/%{token}"
USERNAME_DIME="[email protected]"
PASSWORD_DIME="123456"
CONNECT_TO_DIME=false
3 changes: 3 additions & 0 deletions api/.env.semaphore
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,6 @@ FEEDBACK_MAIL_GOOGLE_REVIEW_URL=https://g.page/r/Ceus2ke10hBiEAg/review
SERVICE_AGREEMENT_LETTER_SENDER_NAME=My Company Name
SERVICE_AGREEMENT_LETTER_SENDER_ADDRESS=MyStreet 111
SERVICE_AGREEMENT_LETTER_SENDER_ZIP_CITY=1234 MyCity
USERNAME_DIME="[email protected]"
PASSWORD_DIME="123456"
CONNECT_TO_DIME=false
11 changes: 6 additions & 5 deletions api/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,14 @@ group :development, :test do
gem 'faker'
gem 'pry-byebug'
gem 'pry-rails'
gem 'rake', '12.3.3'
gem 'reek'
gem 'rspec-collection_matchers'
gem 'rspec-rails'
gem 'rubocop', require: false
gem 'rspec-rails', '3.8.2'
gem 'rubocop', '0.74', require: false
gem 'rubocop-performance', require: false
gem 'rubocop-rails'
gem 'rubocop-rspec', require: false
gem 'rubocop-rails', '2.3.0'
gem 'rubocop-rspec', '1.35.0', require: false
gem 'ruby-debug-ide'
end

Expand All @@ -66,7 +67,7 @@ group :test do
gem 'pdf-inspector', require: 'pdf/inspector'
gem 'shoulda-matchers'
gem 'simplecov', require: false
gem 'test-prof'
gem 'test-prof', '0.9.0'
end

gem 'tzinfo-data'
Loading