19/11/22 - 13h30
parent
f2a1e09a6f
commit
503aeb430e
|
@ -1,12 +1,13 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="1122d9e2-679f-46d6-8c4f-97e9ae4041b5" name="Changes" comment="sss - init new pc">
|
||||
<list default="true" id="1122d9e2-679f-46d6-8c4f-97e9ae4041b5" name="Changes" comment="18/11/22 - 23h30">
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Emargement/test_emargement.pdf" beforeDir="false" afterPath="$PROJECT_DIR$/Emargement/test_emargement.pdf" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Log/log_file.log" beforeDir="false" afterPath="$PROJECT_DIR$/Log/log_file.log" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/email_mgt.py" beforeDir="false" afterPath="$PROJECT_DIR$/email_mgt.py" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/emargement.py" beforeDir="false" afterPath="$PROJECT_DIR$/emargement.py" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/prj_common.py" beforeDir="false" afterPath="$PROJECT_DIR$/prj_common.py" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
|
@ -85,7 +86,14 @@
|
|||
<option name="project" value="LOCAL" />
|
||||
<updated>1668536904183</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="4" />
|
||||
<task id="LOCAL-00004" summary="18/11/22 - 23h30">
|
||||
<created>1668811238236</created>
|
||||
<option name="number" value="00004" />
|
||||
<option name="presentableId" value="LOCAL-00004" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1668811238236</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="5" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="Vcs.Log.Tabs.Properties">
|
||||
|
@ -102,6 +110,18 @@
|
|||
<component name="VcsManagerConfiguration">
|
||||
<MESSAGE value="sss" />
|
||||
<MESSAGE value="sss - init new pc" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="sss - init new pc" />
|
||||
<MESSAGE value="18/11/22 - 23h30" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="18/11/22 - 23h30" />
|
||||
</component>
|
||||
<component name="XDebuggerManager">
|
||||
<breakpoint-manager>
|
||||
<breakpoints>
|
||||
<line-breakpoint enabled="true" suspend="THREAD" type="python-line">
|
||||
<url>file://$PROJECT_DIR$/main.py</url>
|
||||
<line>242</line>
|
||||
<option name="timeStamp" value="1" />
|
||||
</line-breakpoint>
|
||||
</breakpoints>
|
||||
</breakpoint-manager>
|
||||
</component>
|
||||
</project>
|
|
@ -40,7 +40,7 @@ endobj
|
|||
<<
|
||||
/Contents 11 0 R /MediaBox [ 0 0 595.2756 841.8898 ] /Parent 10 0 R /Resources <<
|
||||
/Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ] /XObject <<
|
||||
/FormXob.3ed81f3d7c519076677fdcf9a7737094 3 0 R
|
||||
/FormXob.13be06d0b759aece522fd342e77f07c7 3 0 R
|
||||
>>
|
||||
>> /Rotate 0 /Trans <<
|
||||
|
||||
|
@ -55,7 +55,7 @@ endobj
|
|||
endobj
|
||||
9 0 obj
|
||||
<<
|
||||
/Author () /CreationDate (D:20221108151748-01'00') /Creator (\(unspecified\)) /Keywords () /ModDate (D:20221108151748-01'00') /Producer (xhtml2pdf <https://github.com/xhtml2pdf/xhtml2pdf/>)
|
||||
/Author () /CreationDate (D:20221119110934-01'00') /Creator (\(unspecified\)) /Keywords () /ModDate (D:20221119110934-01'00') /Producer (xhtml2pdf <https://github.com/xhtml2pdf/xhtml2pdf/>)
|
||||
/Subject () /Title () /Trapped /False
|
||||
>>
|
||||
endobj
|
||||
|
@ -66,10 +66,10 @@ endobj
|
|||
endobj
|
||||
11 0 obj
|
||||
<<
|
||||
/Filter [ /ASCII85Decode /FlateDecode ] /Length 1650
|
||||
/Filter [ /ASCII85Decode /FlateDecode ] /Length 2135
|
||||
>>
|
||||
stream
|
||||
Gb!;fgJ6d"&:Ml+o\3UrR_E.kN=iDC#Zf-1LO%MgQ8g:f8_=>PU&"Sfmbhtiij]s`Z2bJu?0B]t?*5r#R1fe^4FZ-?$2H\0VjEom6)J_?'iedj74tI$T9C5hi@iTq;5oL0`&^2de,llEFSK0,9NElC91QB'Q:OIcEu[piAH&jR`5r>CJq$P&TgHf[^i-V=+\5G,i@'AL?9YNYh]DfkZC!X9QSWul\S'J1CZi&$\\GIO>36P[ItSfk1<BRm4985?fp#G@^?Ldd:Ut"t"<<`,VmC'o;B>]4E/I=RP*=%6=H&__iML*VN24b'SgE?U3ii!-8-LIGUJ_Fd*+d!-kD7a>F!0Bb#i!dH==Rn?AA^1cP^EC=\n$\)\;;]NjlrTIE?b7V_D2Q_<#B&/L>NL?J2@etrRKnA;io\E@X5G3.$hheo79TM"(#Se>dA[QhGr$p)P1$t)1K:n=:G*'a33a"oD134KA:X4)<[uCI936LI@VZl/M)+7``5lp)CM&,eMC/Bc/Sl'.T!=]i''3C"Um!@]HKU?jgA(+.d.2<]<J[E._'.<MtK^m[e8+6<t!(n=&/ue)r5?HO"9dX>eMYZStLgriWn!*Cq_@LjC1;+mPdqHXJ(eL;^\"+gQ_0Qn"BZP#]lo6T*co5%#boS9qj+TR&l7,D5C[CaoTH?!"s#DP^"#R"?K5Gm80aR30E/U*q!-&kSNAm>ff@a/sn<jFr99AXpPY!``)]rj0D1Nd#c((1SVt*epg?;=1qM.[@dXT^Z.j"e/RQC/,JEIRV.m<qDr&?#:790K3QT?4AZL]2SibZiU#HEnO0MrZUHcMA*l#Qj%!7KNai2]R?OKf(^Cqh>s,4V2ZKmX=.[o54+%0j0NIpD#P"+kf)a[jX9c_CEU?DpC)EH2KIOEUYet!>Z(K@Fc7cEnA43!?^M\O0B?>.($3gH__%>@@rF/3ZI.s_)oaR'/)%]aT`Em'4>;f;&lPgsb[/rXhi7(C]o&u1fd4qNP6*k&pTgORTO`ZUC4c\W3]^bN(CCi=#X#tch4$OF&IZ17Ld/4_Zk`GU[,b61*O(10eDgo@0)@5m;FFMP?@R9@%gs^:`F0`)3[QP0[aNAoe<]a@87GE`8m'\'XQ&gWi)08%r6OVAm!/jL0JI.%ZOMZ'(01-,rTIQcDc)Hp]K+:J?^c;nJf7Gmt97:7BYcrn,8DXKpEEKpj[)#l0;do"=^goGNDZ])]/7/e=?qgEeU/o(b3$`DD=5pH39k]0!D`_G"@[hED?Y>ED6Bm<'n&n=F6ViU'k@e>OXh7.o6DTEdN[A@OkG!#EHjW7t2PELM(S*VG;]qO6#p%a9kgTp2!mus$khn)5VG?n+Lh:HgLNYF627dMVN*X-O)ZUD"nc,_&%W7*E&cE\$&@/k@kX^4DdEg2A%I7MGc32IEBZ:g2=<F;:-[6+h1UaO*qA>ba_/g`fZ%X4Na4SlJ?3s"U2R10r(nDT$Zo]*dHP[:"I6OYQh>N#6$b>:8WOJ.:k=i^n%p=`/g7alZ$-J>l'u816`8jNeL?,<6L3=Ub=+W1Q:B`G^b7M2sP[Shm?t`&=EabE7`j=^-St3'DBE0(MeLHmBWFCM;VQ.?p,uO,,mG#ZT2N:2=^3$SR6!]TPqn;-oX^9'%;H7^qJ,>-trWc6]<]'~>endstream
|
||||
Gb!;h9lncS&A@sBbRKl<9]g[IDP;T_U;GKepqU;kq2hq[E3_IVUA4K;1QH'XI9><c6'tU[A\Ij7oo*3]M/4FNn0R,TeV^V5F*@C\19&oR_5-%Ec-P(4q<[G6"+89^ZmrRDc8aqo`P&\e\FFP5>2RPA,L5S+gHp1_"YW7eiD@K/0=I)j4-:KQf9pbdg%[\nHYZme.5!/6$]riHGO*eW]1XdLAL6->\Fd5BW3.VNeDaXN<I)=jrlVS!G>Np=Td;D-c(HGPg=4m^^%mPb&sNM5JI_"ooBY&Ck;Ms>L-oeVJt4`Y_d\"L/USC;&uU$6`5n+_Jf!;3>`].i.D`DmNYPeI08kFIQBr3eU^G+"1(onq3&oQ*=\:;>q:Kek'RPrp\puD/hl;3*Z#?eXYb8n!;r1XO]7>ArR2bktI!P`gZ0Q&Ql=,0?XfC-2hq7i_n9*m6-/5RZ\nY8d-hF?dKC="?&Rg1frj[9T]RGH\@3:9C>Z('t(cs6"p`%uidG`6bo!g/=E*'!T_!3ptS<\)Fdk:.<PY.7HK=laY!_)@@ZJ:[F)s.T?6JE[Oecm$PBsicoQX"A#cZ7^o5S:CnFtgkuiaI+Vb?hLGB@ZrDm,>8H!df7%Gc93[c!jOU4l"(p%6J8T0=:61VW@@#(U3omR4M.14B4_I#`LiO2i67.$gT3(lpG%Abtc/[eH8@\!Mn0=WVJZJoKG20\4-5/M%5U:l%,[a]SKJ+Q/$$>6M#?7!t@j+B8)!We%,D:DDbm$=f>.2DF0P:Y5d'RhMtdihLcJ$r=3=;n^<9B4s</Z+[!6uUu)q-keZI:h4-T(&)>$;S!$S2iU#HEFjJntYEue^/_-Oa@/Lj[b[DE@;-%@3%ue1?q7+)J]m0<jSPja=/NV6KS0Ghd+SU:I`#$sp4hs^]=(+5!c@1cF%>.TO#Qpt8HCRZCpZeAc]j.4cb*5p[0>:\Pc0.8g%cgS<DNtf^Oi7+qP[?qi`(!8>n[=O6ae;llE)@#s.Sj`/jVG;CG0H)q71"I(A<'>upXRsmlSmHN19&ash`lS1:6@m]rV>VpRNb8W69Rbt[tWbf)6WiiW.*_;dF]TtV-DZ]aHTFkQQcYi3oLK-h@Af_EjQhiO%'ZX7.r,@O9s0pY!FE,8\"m_N6MZAa3ceAO,d^e+F$kKQ[7q(KGa(>R*mSRg1*aQUhc"n)4b_q*,c)T!'/aCJk,6YJR<u$-chNi8QR!4)Pp\f*6@;roAb'WW9;4KFeIAKnG,*%j:>k;`OkcjPe79e)L),.F5b,grI+aoI_,%RJMD'.]`dQ1orYE'eM@E)e"QI0JOf-5\.;!sP=Z(5dHT$3C>"oYP%u*+q<VBI9-boO[DQm?B!5WJM=<uhr=*:o"=:!ifPT%&eV*Zp\8Ze-DZa,d5maP3G$D?4[4pC:E$&_2"'Hg8$*%ic>BE!Y"9X==pS\R7*<?aqF,d\Ei7k+a#,BZ/TuXuE5FI]i(nE:?RX@H`XH9+YeLmD]I"HpNOJ)g-/tJGYJq:"bT`imuSXb)?JZR4K&l^r7C@VZ8#U/Y8h2ugg-n%8KIJZj8e;/+((54FJG5+Um)DSDBU<p6,Y*fE-+Bl%hUh:ZQ3XO;$ZsnqbcSi@V&u^@p`>3NU9Og^CJHS@kDDUN[7[HT"[\GgDh3#TMF6als8nf><n-g.6k\sA'*qk]R))/);iD@s\/XXTsLXk]e.ETQ[:#q8Nl?0%ie7._jElMP\3`K!dO`_>JJ]$c\WKac!lXIcbUGnQ;"N2]ps&?7O-nu?D>bfP07sTlN`(5](NAcQ\>]e6/:I)9rRn?C.\ocpZ+Bl$EV'[$b3q3jpXk9M6;iE<!p_elgCf.0'7[HT"[];BPh,/]cS)7GR1:UmB,K;T%,\4E/pdg's(t[u5BK8Q69_8`].sAG0*2?.SH3U)Y4'YsLdA7L>"4;uH/htE!dYZf\U(uEf>)q",d@or)*6^#:ZFRl[rG;KCVESV<rM@mipX`)H0ue#PW<pNX8Q:8jBb74W`7.CYJ^eBFW6)s,8lUAkBb8?76e"_-J^qjFC8*Di0]C^5l1qu9s+cFs6^?LMnjE-qJ(d*Ah4T2A^A5nI`[Bejgc"'_IZW'V:u!JlUY8\:HWNGGfDHD8Z&VPXH.hBus8N/)g&K`aUd"~>endstream
|
||||
endobj
|
||||
xref
|
||||
0 12
|
||||
|
@ -88,7 +88,7 @@ xref
|
|||
trailer
|
||||
<<
|
||||
/ID
|
||||
[<865d5b8de25170f9d5ffc33b2c013b7d><865d5b8de25170f9d5ffc33b2c013b7d>]
|
||||
[<466199d207c1fa5cb7ca79a18ce36005><466199d207c1fa5cb7ca79a18ce36005>]
|
||||
% ReportLab generated PDF document -- digest (http://www.reportlab.com)
|
||||
|
||||
/Info 9 0 R
|
||||
|
@ -96,5 +96,5 @@ trailer
|
|||
/Size 12
|
||||
>>
|
||||
startxref
|
||||
10038
|
||||
10523
|
||||
%%EOF
|
||||
|
|
1184
Log/log_file.log
1184
Log/log_file.log
File diff suppressed because one or more lines are too long
26
email_mgt.py
26
email_mgt.py
|
@ -1720,7 +1720,16 @@ def SendEmargementMail( diction):
|
|||
template = templateEnv.get_template(TEMPLATE_FILE)
|
||||
# This data can come from database query
|
||||
# envoie de l'emargement du matin
|
||||
myurl = "http://127.0.0.1:5001/myclass/api/UserEmargementValidation/"+str(val_emarge['_id'])+"/1"
|
||||
#myurl = "http://127.0.0.1:5001/myclass/api/UserEmargementValidation/"+str(val_emarge['_id'])+"/1"
|
||||
|
||||
if (MYSY_GV.MYSY_ENV == "PROD"):
|
||||
myurl = "https://apimysy.iexercice.com/myclass/api/UserEmargementValidation/" + str(val_emarge['_id']) + "/1"
|
||||
elif (MYSY_GV.MYSY_ENV == "DEV"):
|
||||
myurl = "http://127.0.0.1:5001/myclass/api/UserEmargementValidation/"+str(val_emarge['_id'])+"/1"
|
||||
elif (MYSY_GV.MYSY_ENV == "REC"):
|
||||
myurl = "https://devapimysy.iexercice.com/myclass/api/UserEmargementValidation/" + str(val_emarge['_id']) + "/1"
|
||||
|
||||
|
||||
body = {
|
||||
"params":{"nom": str(val_emarge['nom']),
|
||||
"prenom": str(val_emarge['prenom']),
|
||||
|
@ -1739,7 +1748,7 @@ def SendEmargementMail( diction):
|
|||
msg['From'] = MYSY_GV.O365_SMTP_COUNT_From_User
|
||||
msg['Cc'] = 'contact@mysy-training.com'
|
||||
msg['Subject'] = "[MySy Training Technology] : Emargement Matinée du "+str(val_emarge['date'])
|
||||
msg['To'] = 'contact@mysy-training.com'
|
||||
msg['To'] = str(val_emarge['email'])
|
||||
|
||||
smtpserver.ehlo()
|
||||
smtpserver.starttls()
|
||||
|
@ -1750,6 +1759,17 @@ def SendEmargementMail( diction):
|
|||
|
||||
# envoie de l'emargement de l'apres midi
|
||||
myurl = "http://127.0.0.1:5001/myclass/api/UserEmargementValidation/" + str(val_emarge['_id']) + "/2"
|
||||
|
||||
if (MYSY_GV.MYSY_ENV == "PROD"):
|
||||
myurl = "https://apimysy.iexercice.com/myclass/api/UserEmargementValidation/" + str(
|
||||
val_emarge['_id']) + "/2"
|
||||
elif (MYSY_GV.MYSY_ENV == "DEV"):
|
||||
myurl = "http://127.0.0.1:5001/myclass/api/UserEmargementValidation/" + str(val_emarge['_id']) + "/2"
|
||||
elif (MYSY_GV.MYSY_ENV == "REC"):
|
||||
myurl = "https://devapimysy.iexercice.com/myclass/api/UserEmargementValidation/" + str(
|
||||
val_emarge['_id']) + "/2"
|
||||
|
||||
|
||||
body = {
|
||||
"params": {"nom": str(val_emarge['nom']),
|
||||
"prenom": str(val_emarge['prenom']),
|
||||
|
@ -1768,7 +1788,7 @@ def SendEmargementMail( diction):
|
|||
msg_2['From'] = MYSY_GV.O365_SMTP_COUNT_From_User
|
||||
msg_2['Cc'] = 'contact@mysy-training.com'
|
||||
msg_2['Subject'] = "[MySy Training Technology] : Emargement Après-midi du "+str(val_emarge['date'])
|
||||
msg_2['To'] = 'contact@mysy-training.com'
|
||||
msg_2['To'] = str(val_emarge['email'])
|
||||
|
||||
#smtpserver.ehlo()
|
||||
#smtpserver.starttls()
|
||||
|
|
|
@ -157,7 +157,7 @@ def CreateTableauEmargement(diction):
|
|||
new_my_local_data['date_update'] = str(datetime.now())
|
||||
new_my_local_data['date'] = str(local_date)
|
||||
new_my_local_data['matin'] = False
|
||||
new_my_local_data['apresmidi'] = True
|
||||
new_my_local_data['apresmidi'] = False
|
||||
|
||||
print("### emargement insertion de : "+str(new_my_local_data))
|
||||
|
||||
|
|
24
main.py
24
main.py
|
@ -2000,7 +2000,29 @@ def UserEmargementValidation(value, session):
|
|||
diction = {'value':str(value), 'session':str(session)}
|
||||
status, message = mycommon.UserEmargementValidation(diction)
|
||||
|
||||
return jsonify(status=status, message=message )
|
||||
url = ""
|
||||
|
||||
if( status ):
|
||||
if (MYSY_GV.MYSY_ENV == "PROD"):
|
||||
url = 'https://www.mysy-training.comEmargement/'
|
||||
elif (MYSY_GV.MYSY_ENV == "DEV"):
|
||||
url = 'http://localhost:3009/Emargement/'
|
||||
elif (MYSY_GV.MYSY_ENV == "REC"):
|
||||
url = 'https://dev.mysy-training.com/Emargement/'
|
||||
|
||||
else:
|
||||
if (MYSY_GV.MYSY_ENV == "PROD"):
|
||||
url = 'https://www.mysy-training.com/erreur'
|
||||
|
||||
elif (MYSY_GV.MYSY_ENV == "DEV"):
|
||||
url = 'http://localhost:3009/erreur/'
|
||||
|
||||
elif (MYSY_GV.MYSY_ENV == "REC"):
|
||||
url = 'https://dev.mysy-training.com/erreur'
|
||||
|
||||
|
||||
|
||||
return redirect(url)
|
||||
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue