This commit is contained in:
xdrm-brackets 2015-12-09 13:35:43 +01:00
parent f831a1a5ed
commit b8ea4692c4
7 changed files with 197 additions and 144 deletions

View File

@ -43,16 +43,19 @@ if(!Authentification::checkUser(0)){
<!-- FIL D'ARIANE -->
<div id='BREADCRUMB'><a href='Dashboard.php'>Accueil</a> <a href='Consultations.php'>Consultations</a></a> </div>
<?php/********************************/
/* SAISIR UN RENDEZ-VOUS */
/*************************************/ ?>
<article data-title="Saisir un rendez-vous">
<form>
<div>
<select id='newRDVPatient'>
<option value='*'>Patients:</option>
<option value='*'>Patient:</option>
<?php
foreach(PatientRepo::getAll() as $PATIENT)
echo "<option value='".$PATIENT['Id']."' data-medecin='".$PATIENT['MedecinTraitant']."'>".$PATIENT['Nom']." ".$PATIENT['Prenom']."</option>";
?>
</select>Choix du patient
</select>
</div><div>
<select id='newRDVMedecin'>
<option value='*'>Medecins:</option>
@ -60,7 +63,7 @@ if(!Authentification::checkUser(0)){
foreach(MedecinRepo::getAll() as $MEDECIN)
echo "<option value='".$MEDECIN['Id']."'>".$MEDECIN['Nom']." ".$MEDECIN['Prenom']."</option>";
?>
</select><span>Selection du médecin pour la consultation.</span><span class='associated'>Médecin traitant du patient.</span>
</select><span class='associated'>Médecin traitant du patient.</span>
</div>
<br><span>Date: &nbsp </span>
@ -78,9 +81,21 @@ if(!Authentification::checkUser(0)){
</article>
<?php/********************************/
/* CONSULTER LES RENDEZ-VOUS */
/*************************************/ ?>
<article data-title="Numéro de sécurité sociale">
<div>
<input type='text' id='inSecu' placeholder='1 99 99 99 999 999 99'><span class='invalid'>Numéro invalide.</span>
<input type='checkbox' id='tousRDV'><label for='tousRDV'>Tous</label>
<input type='checkbox' id='pastRDV'><label for='pastRDV'>Passés</label>
<input type='checkbox' id='fturRDV'><label for='fturRDV'>À venir</label>
<input type='submit' value='Rechercher'>
<input type='text' id='inSecu' placeholder='1 99 99 99 999 999 95'><span class='invalid'>Clé de contrôle invalide.</span>
</div>
</article>

View File

@ -223,9 +223,10 @@ body{
/* position */
display: block;
position: relative;
width: calc( 100% - 2*2em - 2*1px );
width: calc( 100% - 2*2em - 2*1px - 2*1em );
margin: 2em;
margin-bottom: 4em; /* pour séparer les <articles> */
padding: 1em;
/* border */
border: 1px solid #f09108;
@ -237,8 +238,8 @@ body{
display: block;
position: relative;
margin-top: -2.5em;
margin-left: -1px;
width: calc( 100% - .5em - 2em );
margin-left: calc( -1px - 1em );
width: calc( 100% - .5em );
padding: .5em;
padding-left: 2em;
@ -311,12 +312,6 @@ body{
margin-left: 1em;
}
/* SPECIFIC <SPAN> */
#CONTAINER > article select.associated ~ span:not(.associated){
display: none; /* on cache le texte défault quand c'est le médecin associé */
}
#CONTAINER > article select:not(.associated) ~ span.associated{
display: none; /* on cache le texte associé quand c'est pas le médecin associé */
}
@ -333,6 +328,10 @@ body{
/* border */
border: 1px solid #e5e5e5;
/* background */
background: center right 1.5em no-repeat;
background-size: 0em auto;
/* animation */
transition: all .2s ease-in-out;
@ -350,11 +349,17 @@ body{
/* .validated */
#CONTAINER > article input.validated{
border-color: #1cc952;
background-image: url(../src/validated.svg);
background-position: center right 1em;
background-size: 1em auto;
}
/* .invalid */
#CONTAINER > article input.invalid{
border-color: #ec111c;
background-image: url(../src/invalid.svg);
background-position: center right 1em;
background-size: 1em auto;
}
/* <span.invalid> après <input.invalid> */
@ -392,8 +397,57 @@ body{
#CONTAINER > article input[type=submit]:hover{
/* background */
background-color: #f09108;
background-image: url(../src/save@hover.svg);
/* foreground */
color: #fff;
}
/* CHECKBOX HACK */
input[type=checkbox]{ display: none !important; }
/* label */
input[type=checkbox] + label:before{
content: '';
/* position */
display: inline-block;
position: relative;
margin-right: .5em;
margin-bottom: -.3em;
width: 1.2em;
height: 1.2em;
/* border */
border-radius: 3px;
border: 1px solid #f18624;
/* background */
background: center center no-repeat;
background-size: 80% auto;
/* animation */
transition: all .2s ease-in-out;
-moz-transition: all .2s ease-in-out;
-webkit-transition: all .2s ease-in-out;
-ms-transition: all .2s ease-in-out;
-o-transition: all .2s ease-in-out;
}
/* @active + label */
input[type=checkbox]:active + label:before{
transform: scale(.8);
-moz-transform: scale(.8);
-webkit-transform: scale(.8);
-ms-transform: scale(.8);
-o-transform: scale(.8);
}
/* @checked + label */
input[type=checkbox]:checked + label:before{
/* background */
background-image:
background-size: 80% auto;
}

View File

@ -50,7 +50,6 @@ var dateFormat = new formatChecker(null,
var timeFormat = new formatChecker(null,
'Hi:Mi', { 'H': '[0-2]', 'M': '[0-6]' }
);
// format numéro SECU simplifié
var secuFormat = new formatChecker(null,
'S ii Mi ii iii iii ii', { 'S': '[0-1]', 'M': '[0-1]' }
@ -60,9 +59,9 @@ var secuFormat = new formatChecker(null,
var now = new Date();
inCk.append( inDate, dateFormat, now.toLocaleFormat('%d/%m/%Y') );
inCk.append( inHeure, timeFormat, now.toLocaleFormat('%H:%M') );
inCk.append( inSecu, secuFormat, '1 23 45 67 890 123 45' );
inCk.append( inDate, dateFormat, now.toLocaleFormat('%d/%m/%Y') );
inCk.append( inHeure, timeFormat, now.toLocaleFormat('%H:%M') );
inCk.append( inSecu, secuFormat, inSecu.placeholder );
inDate.addEventListener('keyup', function(e){
@ -84,6 +83,14 @@ inHeure.addEventListener('keyup', function(e){
}
}, false);
inDuree.addEventListener('keyup', function(e){
if( !isNaN(parseInt(inDuree.value)) ){
inDuree.value = parseInt( inDuree.value ); // on caste en <int>
addClass(inDuree, 'validated'); // on active la classe si correct
}else // si incorrect
remClass(inDuree, 'validated'); // on désactive la classe
}, false);
function checkSecuControlKey(pNumSecu){
var NIR = pNumSecu.slice(0,-2).replace(/ /g, '');
var key = pNumSecu.slice(-2);

49
src/invalid.svg Normal file
View File

@ -0,0 +1,49 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
enable-background="new 0 0 512 512"
height="460.01199"
id="Layer_1"
version="1.1"
viewBox="0 0 459.16379 460.01199"
width="459.16379"
xml:space="preserve"
inkscape:version="0.48.4 r9939"
sodipodi:docname="invalid.svg"><metadata
id="metadata3869"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs3867" /><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1056"
id="namedview3865"
showgrid="false"
inkscape:zoom="0.4609375"
inkscape:cx="229.49059"
inkscape:cy="229.69399"
inkscape:window-x="0"
inkscape:window-y="24"
inkscape:window-maximized="1"
inkscape:current-layer="Layer_1"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0" /><polygon
points="143.648,157.54 241.78,255.672 143.648,353.809 157.733,367.893 255.863,269.75 354.461,368.361 368.545,354.275 269.947,255.672 368.545,157.073 354.461,142.988 255.863,241.587 157.733,143.456 "
id="polygon3863"
style="fill:#f64507;fill-opacity:1;stroke:#f64507;stroke-width:18.22995377;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
transform="matrix(1.8882658,0,0,1.8882658,-253.99118,-252.78893)" /></svg>

After

Width:  |  Height:  |  Size: 2.0 KiB

View File

@ -12,7 +12,7 @@
width="18"
id="svg2"
inkscape:version="0.48.4 r9939"
sodipodi:docname="save.svg">
sodipodi:docname="save@hover.svg">
<metadata
id="metadata32">
<rdf:RDF>
@ -45,7 +45,7 @@
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:zoom="18.986111"
inkscape:cx="0.3544805"
inkscape:cx="0.2919805"
inkscape:cy="13.75954"
inkscape:window-x="0"
inkscape:window-y="24"
@ -58,19 +58,19 @@
d="m 3,1037.4 v 2 2 6 c 0,1.1 0.8954,2 2,2 h 14 c 1.105,0 2,-0.9 2,-2 v -6 -2 -2 H 3 z"
id="path6"
inkscape:connector-curvature="0"
style="fill:#cccccc" />
style="fill:#2980b9" />
<path
d="M 5,3 C 3.8954,3 3,3.8954 3,5 v 2 2 1 2 6 c 0,1.105 0.8954,2 2,2 h 14 c 1.105,0 2,-0.895 2,-2 V 12 10 9 7 6 L 18,3 H 17 15 5 z"
transform="translate(0,1028.4)"
id="path8"
inkscape:connector-curvature="0"
style="fill:#b3e3ff;fill-opacity:1" />
style="fill:#3498db" />
<path
d="m 6,3 v 1 1 2 c 0,1.1046 0.8954,2 2,2 h 1 4 2 1 c 1.105,0 2,-0.8954 2,-2 V 5.1562 5 4 3 H 6 z"
transform="translate(0,1028.4)"
id="path10"
inkscape:connector-curvature="0"
style="fill:#cccccc" />
style="fill:#2980b9" />
<path
d="m 8,1041.4 c -1.1046,0 -2,0.9 -2,2 v 1.8 3.2 h 12 v -3.2 -1.8 c 0,-1.1 -0.895,-2 -2,-2 H 13 8 z"
id="path12"

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

View File

@ -1,121 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
height="18.000025"
version="1.1"
width="18"
id="svg2"
inkscape:version="0.48.4 r9939"
sodipodi:docname="save@hover.svg">
<metadata
id="metadata32">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs30" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1056"
id="namedview28"
showgrid="false"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:zoom="18.986111"
inkscape:cx="0.2919805"
inkscape:cy="13.75954"
inkscape:window-x="0"
inkscape:window-y="24"
inkscape:window-maximized="1"
inkscape:current-layer="svg2" />
<g
transform="translate(-3,-1031.4)"
id="g4">
<path
d="m 3,1037.4 v 2 2 6 c 0,1.1 0.8954,2 2,2 h 14 c 1.105,0 2,-0.9 2,-2 v -6 -2 -2 H 3 z"
id="path6"
inkscape:connector-curvature="0"
style="fill:#2980b9" />
<path
d="M 5,3 C 3.8954,3 3,3.8954 3,5 v 2 2 1 2 6 c 0,1.105 0.8954,2 2,2 h 14 c 1.105,0 2,-0.895 2,-2 V 12 10 9 7 6 L 18,3 H 17 15 5 z"
transform="translate(0,1028.4)"
id="path8"
inkscape:connector-curvature="0"
style="fill:#3498db" />
<path
d="m 6,3 v 1 1 2 c 0,1.1046 0.8954,2 2,2 h 1 4 2 1 c 1.105,0 2,-0.8954 2,-2 V 5.1562 5 4 3 H 6 z"
transform="translate(0,1028.4)"
id="path10"
inkscape:connector-curvature="0"
style="fill:#2980b9" />
<path
d="m 8,1041.4 c -1.1046,0 -2,0.9 -2,2 v 1.8 3.2 h 12 v -3.2 -1.8 c 0,-1.1 -0.895,-2 -2,-2 H 13 8 z"
id="path12"
inkscape:connector-curvature="0"
style="fill:#ecf0f1" />
<rect
height="1"
width="12"
x="6"
y="1048.4"
id="rect14"
style="fill:#bdc3c7" />
<path
d="m 7,1031.4 v 1 2 c 0,1.1 0.8954,2 2,2 h 1 4 1 c 1.105,0 2,-0.9 2,-2 v -1.9 -0.1 -1 H 7 z"
id="path16"
inkscape:connector-curvature="0"
style="fill:#ecf0f1" />
<path
d="m 8,4 v 2 c 0,0.5523 0.4477,1 1,1 h 1 1 c 0.552,0 1,-0.4477 1,-1 V 4 H 10 8 z"
transform="translate(0,1028.4)"
id="path18"
inkscape:connector-curvature="0"
style="fill:#95a5a6" />
<g
id="g20"
style="fill:#bdc3c7">
<rect
height="1"
transform="translate(0,1028.4)"
width="8"
x="8"
y="15"
id="rect22" />
<rect
height="1"
width="8"
x="8"
y="1045.4"
id="rect24" />
<rect
height="1"
width="4"
x="8"
y="1031.4"
id="rect26" />
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 3.4 KiB

49
src/validated.svg Executable file
View File

@ -0,0 +1,49 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
enable-background="new 0 0 512 512"
height="353.54437"
id="Layer_1"
version="1.1"
viewBox="0 0 501.78812 353.54437"
width="501.78812"
xml:space="preserve"
inkscape:version="0.48.4 r9939"
sodipodi:docname="validated.svg"><metadata
id="metadata11"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
id="defs9" /><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1056"
id="namedview7"
showgrid="false"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:zoom="0.65186406"
inkscape:cx="199.25646"
inkscape:cy="303.73443"
inkscape:window-x="0"
inkscape:window-y="24"
inkscape:window-maximized="1"
inkscape:current-layer="Layer_1" /><polygon
points="113.72,250.624 216.919,353.803 398.28,172.334 384.235,158.192 216.919,325.518 127.862,236.481 "
id="polygon5"
style="fill:#1cc952;fill-opacity:1;stroke:#1cc952;stroke-width:11.59998226;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
transform="matrix(1.6674164,0,0,1.6674164,-175.96454,-250.06035)" /></svg>

After

Width:  |  Height:  |  Size: 1.9 KiB