Compare commits
2 Commits
Author | SHA1 | Date |
---|---|---|
Grégory Lebreton | a2f33f9d1f | 9 months ago |
Grégory Lebreton | fda37015f1 | 9 months ago |
@ -1,63 +0,0 @@
|
||||
kind: pipeline
|
||||
name: mkdocs build and deploy
|
||||
type: docker
|
||||
platform:
|
||||
os: linux
|
||||
arch: amd64
|
||||
trigger:
|
||||
branch:
|
||||
- prod
|
||||
|
||||
steps:
|
||||
|
||||
# BUILD
|
||||
- name: build
|
||||
image: squidfunk/mkdocs-material:9
|
||||
pull: if-not-exists
|
||||
volumes:
|
||||
- name: site
|
||||
path: /drone/src/docs
|
||||
commands:
|
||||
- pip install -r requirements.txt && mkdocs build
|
||||
|
||||
# PUSH FILES TO SERVER
|
||||
- name: deploy files on server
|
||||
image: drillster/drone-rsync
|
||||
settings:
|
||||
hosts: ["92.243.16.7"]
|
||||
target: /var/www/html/mkdoc/site
|
||||
source: public/*
|
||||
# port:
|
||||
# from_secret: RSYNC_SSH_PORT
|
||||
user:
|
||||
from_secret: RSYNC_USER
|
||||
key:
|
||||
from_secret: RSYNC_HOST_KEY
|
||||
|
||||
# TO CONFIG AND TEST - SEND MAIL NOTIF
|
||||
- name: notify
|
||||
image: drillster/drone-email
|
||||
settings:
|
||||
from.address: contact@legaragenumerique.fr
|
||||
host: mail.gandi.net
|
||||
port: 465
|
||||
# skip_verify: true
|
||||
debug: true
|
||||
username: contact@legaragenumerique.fr
|
||||
password:
|
||||
from_secret: MAIL_PASSWORD
|
||||
recipients: [ contact@legaragenumerique.fr ]
|
||||
subject: >
|
||||
[{{ build.status }}]
|
||||
{{ repo.owner }}/{{ repo.name }}
|
||||
body: >
|
||||
📝 {{repo.name}} / {{commit.branch}} - {{commit.message}} <br />
|
||||
{{#success build.status}}
|
||||
✅ succeeded for 👷♂️ build {{build.number}}
|
||||
{{else}}
|
||||
🛑 failed for 👷♂️ build {{build.number}}
|
||||
{{/success}}
|
||||
<br /><img src='https://www.legaragenumerique.fr/wp-content/uploads/2019/10/logo-web-garage_numerique.png'/>
|
||||
when:
|
||||
status: [ success, failure ]
|
||||
|
@ -0,0 +1,24 @@
|
||||
image: python:3.8-buster
|
||||
|
||||
before_script:
|
||||
- pip install -r requirements.txt
|
||||
|
||||
test:
|
||||
stage: test
|
||||
script:
|
||||
- mkdocs build --verbose --site-dir test
|
||||
artifacts:
|
||||
paths:
|
||||
- test
|
||||
except:
|
||||
- master
|
||||
|
||||
pages:
|
||||
stage: deploy
|
||||
script:
|
||||
- mkdocs build --verbose
|
||||
artifacts:
|
||||
paths:
|
||||
- public
|
||||
only:
|
||||
- master
|
@ -0,0 +1,28 @@
|
||||
{
|
||||
"version": "0.2.0",
|
||||
"configurations": [
|
||||
{
|
||||
"name": "MkDocs: Serve",
|
||||
"type": "python",
|
||||
"request": "launch",
|
||||
"module": "mkdocs",
|
||||
"args": [
|
||||
"serve"
|
||||
],
|
||||
"console": "integratedTerminal",
|
||||
"preLaunchTask": "install-dependencies"
|
||||
},
|
||||
{
|
||||
"name": "MkDocs: Build",
|
||||
"type": "python",
|
||||
"request": "launch",
|
||||
"module": "mkdocs",
|
||||
"args": [
|
||||
"build"
|
||||
],
|
||||
"console": "integratedTerminal",
|
||||
"preLaunchTask": "install-dependencies"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
@ -0,0 +1,18 @@
|
||||
{
|
||||
"version": "2.0.0",
|
||||
"tasks": [
|
||||
{
|
||||
"label": "install-dependencies",
|
||||
"type": "shell",
|
||||
"command": "./create_venv.sh",
|
||||
"group": {
|
||||
"kind": "build",
|
||||
"isDefault": true
|
||||
},
|
||||
"presentation": {
|
||||
"reveal": "always",
|
||||
"panel": "dedicated"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
Before Width: | Height: | Size: 78 KiB After Width: | Height: | Size: 78 KiB |
Before Width: | Height: | Size: 170 KiB After Width: | Height: | Size: 170 KiB |
Before Width: | Height: | Size: 109 KiB After Width: | Height: | Size: 109 KiB |
Before Width: | Height: | Size: 254 KiB After Width: | Height: | Size: 254 KiB |
Before Width: | Height: | Size: 220 KiB After Width: | Height: | Size: 220 KiB |
Before Width: | Height: | Size: 67 KiB After Width: | Height: | Size: 67 KiB |
Before Width: | Height: | Size: 109 KiB After Width: | Height: | Size: 109 KiB |
Before Width: | Height: | Size: 372 KiB After Width: | Height: | Size: 372 KiB |
Before Width: | Height: | Size: 211 KiB After Width: | Height: | Size: 211 KiB |
Before Width: | Height: | Size: 174 KiB After Width: | Height: | Size: 174 KiB |
Before Width: | Height: | Size: 175 KiB After Width: | Height: | Size: 175 KiB |
Before Width: | Height: | Size: 5.7 KiB After Width: | Height: | Size: 5.7 KiB |
Before Width: | Height: | Size: 107 KiB After Width: | Height: | Size: 107 KiB |
Before Width: | Height: | Size: 217 KiB After Width: | Height: | Size: 217 KiB |
Before Width: | Height: | Size: 147 KiB After Width: | Height: | Size: 147 KiB |
Before Width: | Height: | Size: 124 KiB After Width: | Height: | Size: 124 KiB |
Before Width: | Height: | Size: 80 KiB After Width: | Height: | Size: 80 KiB |
Before Width: | Height: | Size: 169 KiB After Width: | Height: | Size: 169 KiB |
Before Width: | Height: | Size: 65 KiB After Width: | Height: | Size: 65 KiB |
Before Width: | Height: | Size: 110 KiB After Width: | Height: | Size: 110 KiB |
Before Width: | Height: | Size: 61 KiB After Width: | Height: | Size: 61 KiB |
Before Width: | Height: | Size: 71 KiB After Width: | Height: | Size: 71 KiB |
Before Width: | Height: | Size: 176 KiB After Width: | Height: | Size: 176 KiB |
Before Width: | Height: | Size: 100 KiB After Width: | Height: | Size: 100 KiB |
Before Width: | Height: | Size: 514 KiB After Width: | Height: | Size: 514 KiB |
Before Width: | Height: | Size: 124 KiB After Width: | Height: | Size: 124 KiB |
Before Width: | Height: | Size: 94 KiB After Width: | Height: | Size: 94 KiB |
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 22 KiB |
Before Width: | Height: | Size: 34 KiB After Width: | Height: | Size: 34 KiB |
Before Width: | Height: | Size: 47 KiB After Width: | Height: | Size: 47 KiB |
Before Width: | Height: | Size: 207 KiB After Width: | Height: | Size: 207 KiB |
Before Width: | Height: | Size: 261 KiB After Width: | Height: | Size: 261 KiB |
Before Width: | Height: | Size: 90 KiB After Width: | Height: | Size: 90 KiB |
Before Width: | Height: | Size: 190 KiB After Width: | Height: | Size: 190 KiB |
Before Width: | Height: | Size: 203 KiB After Width: | Height: | Size: 203 KiB |
Before Width: | Height: | Size: 63 KiB After Width: | Height: | Size: 63 KiB |
Before Width: | Height: | Size: 38 KiB After Width: | Height: | Size: 38 KiB |
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
@ -1,35 +0,0 @@
|
||||
# Les différents mode de calcul d'un arrêt de travail
|
||||
|
||||
Nous utilisons deux methodes de calcul:
|
||||
- en jours calendaires
|
||||
- en jours travaillés
|
||||
|
||||
|
||||
!!! info "Information importante"
|
||||
Il est important de :
|
||||
- s'informer la méthode de calcul qui est privilégiée par la __convention collective__
|
||||
- __comparer__ les deux méthodes
|
||||
- __toujours__ choisir le calcul qui est le __plus avantageux__ pour le salarié.
|
||||
|
||||
Pour les deux méthodes il faut avoir connaissance du brut, des heures prévue au contrat
|
||||
|
||||
## Méthodes des jours calendaires
|
||||
*jours calendaires* =
|
||||
|
||||
Le calcul est le suivant :
|
||||
```
|
||||
*(jours dans le mois - le jours d'abscences)/ (nombre de jours dans le mois)*
|
||||
* brut / nombre de jours dans le mois
|
||||
* nbre d'heures / nombre de jours dans le mois
|
||||
```
|
||||
|
||||
## Méthode des jours travaillés
|
||||
*jours travaillés* =
|
||||
|
||||
Le calcul est le suivant :
|
||||
|
||||
|
||||
!!! tips " Pour éviter les erreurs"
|
||||
Vérifier que le taux horaire sur les deux méthodes est le même, en divisant le *brut/ les heures travaillées*
|
||||
|
||||
# Exemple, mise en situation
|
Before Width: | Height: | Size: 106 KiB After Width: | Height: | Size: 106 KiB |
Before Width: | Height: | Size: 47 KiB After Width: | Height: | Size: 47 KiB |
Before Width: | Height: | Size: 155 KiB After Width: | Height: | Size: 155 KiB |
Before Width: | Height: | Size: 70 KiB After Width: | Height: | Size: 70 KiB |
Before Width: | Height: | Size: 34 KiB After Width: | Height: | Size: 34 KiB |
Before Width: | Height: | Size: 74 KiB After Width: | Height: | Size: 74 KiB |
Before Width: | Height: | Size: 88 KiB After Width: | Height: | Size: 88 KiB |
Before Width: | Height: | Size: 106 KiB After Width: | Height: | Size: 106 KiB |
Before Width: | Height: | Size: 156 KiB After Width: | Height: | Size: 156 KiB |
Before Width: | Height: | Size: 1.3 MiB After Width: | Height: | Size: 1.3 MiB |
Before Width: | Height: | Size: 285 KiB After Width: | Height: | Size: 285 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 153 KiB |
Before Width: | Height: | Size: 114 KiB |
Before Width: | Height: | Size: 130 KiB |
Before Width: | Height: | Size: 51 KiB |
Before Width: | Height: | Size: 30 KiB |
Before Width: | Height: | Size: 54 KiB |
Before Width: | Height: | Size: 328 KiB |
Before Width: | Height: | Size: 96 KiB |
Before Width: | Height: | Size: 138 KiB |
Before Width: | Height: | Size: 37 KiB |
Before Width: | Height: | Size: 26 KiB |
Before Width: | Height: | Size: 49 KiB |
Before Width: | Height: | Size: 31 KiB |
Before Width: | Height: | Size: 71 KiB |
Before Width: | Height: | Size: 115 KiB |
Before Width: | Height: | Size: 17 KiB |
Before Width: | Height: | Size: 61 KiB After Width: | Height: | Size: 61 KiB |
Before Width: | Height: | Size: 32 KiB After Width: | Height: | Size: 32 KiB |
Before Width: | Height: | Size: 40 KiB After Width: | Height: | Size: 40 KiB |
Before Width: | Height: | Size: 78 KiB After Width: | Height: | Size: 78 KiB |
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 30 KiB |
Before Width: | Height: | Size: 68 KiB After Width: | Height: | Size: 68 KiB |
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 22 KiB |
Before Width: | Height: | Size: 64 KiB After Width: | Height: | Size: 64 KiB |
Before Width: | Height: | Size: 88 KiB After Width: | Height: | Size: 88 KiB |
Before Width: | Height: | Size: 40 KiB After Width: | Height: | Size: 40 KiB |
Before Width: | Height: | Size: 62 KiB After Width: | Height: | Size: 62 KiB |
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 22 KiB |