uap35-d/sdisM2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge origin/master

Browse Source 
Conflicts:
	web/WEB-INF/feuilleGardes.jsp
	web/css/mycss.css
This commit is contained in:
clementine.desrucques 2021-12-14 09:31:59 +01:00
parent f74104e7ff
commit cac0c6423f
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
web/WEB-INF/feuilleGardes.jsp
View File

@ -68,6 +68,9 @@
<span style="background-color: yellow">Au travail</span> <span style="background-color: yellow">Au travail</span>
<span>De garde : X</span> <span>De garde : X</span>
</div>
<div class="text-center">
<button type="submit" value="Valider" class="btn btn-danger"><i class="bi bi-check2"></i> Valider</button>
</div> </div>
</form> </form>
</fieldset> </fieldset>

8
web/WEB-INF/web.xml
View File

@ -24,6 +24,10 @@
<servlet-name>GPServlet</servlet-name> <servlet-name>GPServlet</servlet-name>
<servlet-class>servlet.GPServlet</servlet-class> <servlet-class>servlet.GPServlet</servlet-class>
</servlet> </servlet>
<servlet>
<servlet-name>GardesServlet</servlet-name>
<servlet-class>servlet.GardesServlet</servlet-class>
</servlet>
<servlet-mapping> <servlet-mapping>
<servlet-name>AuthentifServlet</servlet-name> <servlet-name>AuthentifServlet</servlet-name>
<url-pattern>/authentification</url-pattern> <url-pattern>/authentification</url-pattern>
@ -40,6 +44,10 @@
<servlet-name>GPServlet</servlet-name> <servlet-name>GPServlet</servlet-name>
<url-pattern>/PompierGarde</url-pattern> <url-pattern>/PompierGarde</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping>
<servlet-name>GardesServlet</servlet-name>
<url-pattern>/gardes</url-pattern>
</servlet-mapping>
<session-config> <session-config>
<session-timeout> <session-timeout>
30 30