M]D ,Ez1I*LHD2@=B^i
@P3X2kI#u6 F)I4ٌj'l̎u"=SUjukg&gS[, T5Tryl^cl
-[sJ,g *SABrsf±86\ *t
-Tn# P{x|%Urs˕v2_K:[Rb 97&V)'ݷ8@>DŽ)g椭<;ǂd>ڌ}e :AM~
C `
9W(32T[irt)p4f[heV)}zi4O:17Dy
-
-, @&c1P\1;4=po_z u)_X ?P bi!+&X 6N i)3jώՈƐ``Z`/f{XԣDZO&P&{ ضZ;P1sv aqx p\iސ 2\,oeAU1Uv
-&[ A*L۾Pr Mf@7G4%xmx$uZƤns3csᆌ0wsJez^P-pGM3@"CYd KF儅Et":1.e SDqߐU-[lφfۄ:oaQ2^mbۻ )3ػE}Ce_!jiP57nBWV7GRq=$H{e(0 =b+XT2&wO [PV07_
-_Rc(dFjFz9r&xrzdԘp_N,g4>p-W55_5^?Few?xv9}]7͛GY]ޏ)ރmfNS$zO CX4ʦG Sx}BKb6[lLC½饻?5MBcDH-u,Zhmq I;xS p eK\7泃e|G+qdJ0u tCY \sv0,ّ㳸#0[,2W۶{5P)h K^/Iyu;urܷg_.zr+W4r.RW2}؈ zH0gYO(c<jl](.z4v]Ym ܔY
`0Fg2OgUp j=6o㢒HO!V+:wRF.^%Q LDfБ*L) j4L G%/
-<..Mz4P5sA[HvgF@9)@4 G;+"g } ' Ap !,J$jB5"z*tDi:qnt
-PRlt S'T<#r5 5K Vsҡ%UWh_!~q
-Nb6o,jma2!Z3m4/.5i=^+)*lBU[BHxrW|'+e|dR* B}SE.~qqmv DxpF Em
˃`S ݼB,?"#iiMl{h@18+'-[l&|o5;;KbA昆ə[SjZCȬ"clmQ7!gW3ʥ`ş]uqMڀk
-;1Z_D{E"FդET秫;וtk*xn#1W,h>Np'@{|NudRV_/aDeolPƜo(Q6C[6`DKC<d38(A-3z|t&6r&le{➰M8FA)1{*P}DwP[ .WĹ_2Wy Fo *,9iwI< oOЁ qS
\3^Qg][iФFj9πdz8ɘ
-k5
-?/ ApNgÜZ!!/Bf&ߦ=KP-Bq/bW%TWT\YiYtJTEqnF73U@?81-d<~1X>yNR_I+:Ram Wl=/Db#SszutJnYu
~vї@*Z^uuV8꼈,-[ZĴe& ĎͤX;e+ ˘IVJlf=O0Ѻԭ뗖rۇR@ggH۷}!:|W]~#K:W, 人)>Eڪr-ݐ<6t1 B~ƯhSW2z p;~Gp:<:TEȈ
-@^
-覾EXʡ10l_ = H_M&"1z_Act~CWqoO M'?zC{1G-}4
윇嚔*iҖ?9!{z5]j4}&&f r _ʴP#hg\c[r*=#sKLM6XeVrE8:>RR7Ƽ*-% xp> R27.U,'Rp h2U rI̾y w TRs$.e *v!3^Z9olO0Ot]Y",ٻ M=kj,vr%|@ ?e@br>ibU&2ʹ.35@fZ` {d~jK֝w'ǯk S? j bP{1ZSW _( Crv|6!g3- pI ;}T Jsu]ol)sKZOź U t ,
]SR jo"7H@\]|pYV\! ~Yˋu r1ud/Gx-rEH3Q9}> | H۳CB05I
xVZ}^"B
-zi+QsHˡU^Q YZ*/:ysR1G~7#
-?ub
SX7+IV}ƆF ~ S'h
-endstream
-endobj
-5956 0 obj
-<<
-/Length 12434
-/Filter /FlateDecode
->>
-stream
-x| u}\=W} ;;{ H(J,Eh M" e)ʩ"]&bW؎+q\]2"*ˑ\v()(6cfpQ.W@w !6y$# Gɧ'ǃ |#%={bQ\_?{#oؓ }_!B~?¯7ކ?W =_> &= }o?ϳsE?v6QY? ђ;;Zo53וVOh/oog~;A`1
/Gѿ})%Oש]KY~^ז7>ַo
%0ϔ2Y'GI&{h=
XN?=JB \?G+4gIq&#N0|XEj$M/06MY $#0~r iH * 3 y ^H6D#Y&c,!0*9 btQ׃1:/"AxK SQ\{\ru ^# EΊQW|qS?^"ڵq~J_7 q8?+!xw>.? eq~Uwę(_/EEQ$_/DK;bܬ7+g8/vG| '/y\;"8?gֿ̮ψv5xnYoYKY \!s6.er2} x7s]T^"{`ez^ & K)\!zp _pׄB(E;<ߺB*p\B=<>[.nUQ?9^kA8wԃ_wbr`j@e^⯶HNZ (ѐ3)w$B
Lk!|~6ʕ #wӻp
ax, 1apϬWQY@utf4X>*Oٯĸ62( Tl{f#HJ>(B2,%wIxghٻ *Ʃ9XpJ1U_U=P7URKѠ6kDbXV`r*@6'6'xkfԆUAAqb+ &exF| lE <kA lq|6 Nqg1@v F
-Oez*k<
-91 V]iT1 E1L
gKJ1sL44ͨdy[
-j/ uh3+ ru 3o
- 0\gadRmdnrJ I-? R>k\.J`GzY%@pu8Ku]: ,I k|
-Q%YL$ȴw & ]nqXR3m|$|rYV]#b! A C1D\ { `K,Cp 1b .OY-ED]\-
-7 8UR#EUZfN,VC7r^,ЌJTES4V=bFЍ[VPÍF*k'vfmyҗR#)ߒI%O~`ED/.Dq-0]0J% !"`od (H a#7:LÕB]QY&mF?c
-gаpW팈\#]%^ƈX6'ya . # n\AnF&@.@LGn@gn6O-p,^ vL2U #_"t iɴ~ zl'/"/g<69L 79q[d_Q&'އ·N
;;~!F#N.
-W]-/:HwRAQ94˵oq*ێe:#jVT%i+VOי=ÍѬO R匁]ݭ!(|/UQUA_f?EVuVVR*qLe S9pvsA/ ? 2U_Щ :
yd07y p(g3G: p5 "Meeq:2?5nARTa $`-6&<ץXaa :1FiCM1nVo(%[L4Uǝ@qdWj`2 ?<[_Ҟk dJƋ} ;|**b6 S}N
0>o
h! _2+ ]9E- EG@{{H .]eF9-+teM) 5CQS
D48"0*'4tk.2&^!&PtL!
-Z!VEAz ^ 3#6gO 7ug*. cyEh6ns#ܢZ>. M {`ۑF%\a2áp 9m[hn/Pyh6ZjBn0p$ Oܒ~H'S°1Ιt%G'uZz
ikrRZXܠQcan'[l:Md1tLتإčLjz 6_` *hZoA/j _# m ?AFR 2"3ٱx"0R nY2pqhKs0#X
-k 0O/d
-HUt *_+o8Y&_gf] !.,`횰Mc7ɒ^e^U&rE
- ]Hh qMh9;|-vG
-" 1Q3܍хM4
J h1`Y3:~ &*ܹAW6d0ޏnTJ[Æi`5~g;txdbr0v=g' N_|y{ͽt
-4wI |,(ߢN
-_ۯi\!ѱG\o3'&^ ='>&fu!!0 {Ҋ|
-Sx"e <[}99RhX3bi ]s Nq =4Km@&e P d @b="=LGD# (vyr`%aH `\% {z[Z4KASb<1^XjJ˩hR M7!w d4+ ܹprB'@$f;>ٮC麳V \s+>_*UDF\w&Պ&b]NOmc_
WwoaqW+8JiT鳪 sV:ޟb?%L^Bo:IHIWBSe,:q&QYu 2Wf 0PĂ#_""b`0.Fd|Ihy3I}8% ɏO#{LH;BD#ux5Im4ˤBk? tc(0:\喷 Tկ2HӍʾ|dꖥ+NQu xR0o~(ZwYҿ.$=5&O>חVos fR^ ޙW> V::PF8#ͺᵌ)V UJA 3-nγ fHb2 ?זAS}q?Ÿ.Č1'
- F^02baAlЄ2D:Pt&Ƹvhp˅S |e$-ҠgA}6i*pp4+oO/2C`j b`tdZ}9N:?~(hRMSO+бl9jEXU]5X.78&/M#`"iAiH eҥ
vl'W_4L }2h'F
-M?}m
-aQ3x6
-42f iH !E
i& (uC67[-B3/N2o2 y a CT:_<{O?wu5 𫪢Zq$L*sφ|$1jm\bdp#llND ?V>
-A1 F<퇏#c >} C5!Y7t|;ˮ`Աk 3b+мOdm5 \`>
-C0W) eW4o! =`\q}M۞N>榽L@LǠiJ٥܃/` @9s4sөфL#xFQXr
-r 5 'O/W 2z,3: h+\|I<4ӌ d⑀$~/ť q %! :@JQ@?Olw8<$
- naYW!67~W$wZI,K,Kg,ۃ b|yxguep{ k2E{ /AQ(U#qt7N.2&'`!
-*pR0*ѭBtD:cRV\0\
G)NdBƗNT+h31mY?BnlXdn'21jq%b%7>ڟ+s %*9XPLL=u{P\KM_z
|<e[F9y7昔/yüGGۿK"b\XmnܗLԭd]=
d
-6Y&\9@M_ q[^:gSJxN'
r?T!NY>zukd sD"%}Ԍ).p ɔLisÜT8ˀ-bcruF݁Ic^46j nd/u \1 DO Q\ɻ1#1,r-Б' ,C -8T e#m(/SmaVw L'X:p.DxA]Nޡ<Fݘklv}p8
y-].Tˁb
jH* Gb7LN
- sGz+_{9sbZ:_e/:W%p^/>+,$ȤtHtQ1hiBcu,u
-Pc?Lߏ ޕ,=UOOOLYgϜ݄`"zcC ,J @ /Qo/_^b(Bv]s < (
-27IK %c
-H!g&L8&cӅlˍ1
-o* í]O]^f:҆ OwҞc'lݰ
:3"w"$K\nKLa0Ylҗzdwh!ļ PLfze.cpLoGV(w[TtcRmDe
-11+&*,
-QF?1(.n_L#`4ٵFϰ-m!ьiOJcȭ#zǪ/8ңg?xO2(3(
?]"E
-!:@d :
-8k\7v')r\V鸹6 N} 6969@<79)Z"Y{q/<0{8cK an3=_EbWmmG={q#y_^ѽƆgy#{~\ARIY$ßF)YRZپvj
-\
-/sAVhxQ4
-nDMEMROQ[T[kT_.9f61Kɴ7W;QIsd|g
r
-(7c ;UHਫ਼R98 (\l`6feK6L4ףEʷ@Ā h,Q *º~R{4 LQ0EP3*e48t41F?)V"F
Fk/|e'ӉD?Hńw= J/`mE|az'.tgUjٹ}M)T&JQ{cժ6([#ymLm֞&+FDZ&w̚ϲ!@]ߛ6 ei]>fb{Xh6 랚r
-w,!+P4n[7kk+|Ow(T6skuoۻr`#> ( S~uz6#8
}{5 Ɛt8Ҙvhc VL>\c38ذElYӬG0\T [,2:,A"
-Kr0 R ܅tճnwOXe mx^l(ũwҠD9
u4X+eMhİtOLYѶ>u
Wb9fz[\ICO MHʈL%ƓA7 7_qiKz7~g_TsVFkNѭR]9sURJ <_# mk|M*
d Eq*YZXq0e7y ƳGH&+ipq櫶bw5.b
-S0Td0Ō8Ý [Vu!wW-ɶ{f%Mu m[/hlDGmWv Qhthd#h?41rZ0-@$P Q&+H]Ms섣/N =ZrT+ !V sW{;ߡ¹6BaOl;.,SauS=(Y*9˶`IGY>ўicPrDR._ њg|RY; o,"= S@͊F̅C;'?aAP +Kļb"3'ZJbUe)*xjY3PR^"Bl̈́2f}rb׆yN."kKbv a6w Fs[H̫w0! X@X cXAڌ^ |oKFҍ@\:GCdA dksC0u} sjT7}|zPGUVjo*y&4z<0KLy
շv][$*YV'5Jq'Rǥ@QY`F{Y-z ReM o;̛[m=k^Ԇtm2]X]
-(tk(hOxef. GS7'4X}|s9i}VlGp;EELh%rIjׄ:0-]iS v q[d(jz=ׁُ-0B[d_,4 g{md,"feT: g_ƪ .̉f`)ѳ-ag ^RgK岆2؎Cf2B\C7+H61ߕUL%U9aͣ53sj'Ϲ{6 <:cAKܭŲ?z7<]70qtj LTUR%jg$by[M b}DXV-~Vbp{e ܶ5Q.'ݱ9.']l4cW5g`3\q'"ym-[z6c[p]PFZܾc 鋩 ~"̫\ݽ7c0r' eL$HvVڽMyy>M\0,tu'R΅tj*Xe(jtKGF hg'v8 Sa=C"h掟|]y f /<+ipe 7C{]%ȬA5~|A4b}K}X8^u7 #$\N8NvgIfu] f?>dMe TƨA\h;Ήkb}-3Bk$ȴh] gAwvb 3X 9<~YTZ)HP;#(7y`Rv L#Γ,fdX9fMòdAg뺕LǼhA^{^Pӕ[ջg5NKm#l3l̄q<\|d']E)o <Lp0~9qKgH= ~v;mz2j +P%k<Lj}Eԁu`|?Wj pgMK:)~ ]+e85FE 9ؙXڵUmCQ' Y|EcrI&^
\S6`?HgqDy ^-d lì^>W
-i M%3@K3,yÜ ^0(gnۮ-#( o0!f=_l0 5 ~o ẍFl7?H_ nYd~_0պ2& 0oP ƴq G m9Hk E#"$zܴD
8(C.; ` /jCfzqC2>1{'8j]$L{66w1 M&fQ @dկ
ITMV;b[i?CdgJ qk)@ܱ:Ve~ʿ&5_n`⩤=Wd%f(?|2;^4͟g>~s']wSǚ\w,}gϓS_Cģƫ|. "OI; @W
-(@<'3݊"(a ld$1`/0 ]psQ'2 7|@ &x ?; k YqѴNo)rQD AL b;:J]JY_0 + C=x26u>2\>jQnx=*_|F &3iku"a͌2YT)e-ײ-.һd6gQ>S%OŝnCT:_rZgdcOg(wyeoSžL-qHP
iNʧdHחD1=@~|@~DI"1 f ?qwfy90|CH`M5՚jy3ᅥ3PkWDƬ 7@DMFk$̐$
v/Kmd (*ˤGRWb|/ J߅v`p{Der$i$η C$%4BL&:=A;*OAOs-*'vOsd &e э@KНBVs(83 ,έ^gB@ u~Y ۨ*X|q_, ;ÍG^<*^&n7JNe:#N8q^<#>
-stream
-x{ x ՕfZjCR?Uݥ~w!YnI,ɶ$ے 8h1|<&8 &1,$&FC2'HUY>28Y#$;N&soU?bcvU{y-7zRRPJ{%JE@sMgK,~F|o>Z=ۏ t=~5>ܳtlur PTxMJ)yߌM& 2<+)Z$~
̬ls9fa쥞DN&]?'K&%H/>/{U#PbTq~ӊoV1;
6ҪRϫ>l6>xYmUϫ/!WR> ڿ~Sҏ6X
}1k7>oz s|Zyl$QZ4%TĒ÷Z)zRYw%JBgY^{R RPOnjO()y9g
-P+ӔVPPFLQڞ"dgFo/Sk9\izΥt.B EۂZ{ ijxrm#k7wKmwKshp瀯t2QGrJQGdJ0a 3(0 rʤk1
g8y3E|ɨcu V
- ;WH}3 c㉌;O[k0LgSsBi &05"hƄe-BH"UA%W_gXö4lKz($M&SϧGV>z# w`,=y}}~ƣA_:iU|FJ`kؓ:%)̢A %Bu}>NɊxp&:X- AjMUg`B@[,
-˪Z~ Z,^6 $Yx1+"`2;Qٞ\OaCmVf8U{z,1p{NOLJ+:xkI
z,=D9k)Z@sCYt'us $% I$z9ȕMv#Y IjXMN
_Zel5ښ YwTΑ ՍBILpԘ̂V3<^ H p54#No Jh $Jb 6].+,cue&Ւ1nԚ0v}~iJ73>Y-#g<*jd_ 5,4aBS2TQm"V=2"JTUÙW 3c|d]p-a9
;z] 7_\yW{Z̑-V[< ֻZfP81.*Y ܭ n C FB_R `qII1Q':^yeSZ8:P+2
-vA',! ^٥xvPٖ?BÄrdC:
%B/
xF矿vgJND}on:}ڈvh-5i+oC
^Lg~g/PmB Ӻ8Dt鏘)O ycA%
-^D Dcwy/,t }/
T8;ϭ}0w3̭vY}vM䢈
- g|#cCGL( *@V "l
-o7.1A8s*
>;136w _)1x&e'rߎl+*NuAVЛLD-Wȼ(F ND!G5vxvyg:],XWfo(l٘2auAN'g@:S爞 =55Q;"-`W u啸Kפ? CݔEz+H
Aq3lWu-MqG$uG-{K lĄFΨA6yP'A>$c ,En\ʌ7fZ(}
bJq+r0E+l* G+cC:z_
-`]~EJ |?C_c~ܫ#j wY9=}= %421O[_vQhO[[U \;`K, hq+6 ap NJ&U::uT >KU#P~C|̱R-x|Xk k\Q;ǀ/",' E3PM|VWeop$aŊUaSAH; @"@!a'R"i0: JcTR'i9|pE"W
*-FQcv;2W=//R| ˕*1Lmbbo$Xm"tm \=*mbyKtDǡgFWxЙLf_
-
-xÝ1 k14i'j
{R nvYyG"~}@ xW,j5f7U~t:aK >T5la>QM g\mh/=f>F_%Znp"yeK\KIgoY]QYdG&QdWHa^TtUlmu^&(ЕW;6@.TV{[z<ʰ թn4r#h:z,)!t[_@P #;(v q-`J`k=RAj$bw#I9\n.=Yon{4oOܦnHmï=m~]w^" {/Kav 5]d^; དBz&LM*$ XBϲ^d(x!,<*r>W|?eJ1 B^+tBdv8 "lA*Q Wqe Vl~,Dyz B ߉;㩍LHQDtB Ji] _V/ N^o]bĤ#fR'&&6xgc6DRd5< փy sDL/OTW`u NhTWt(D *
ltu H^/6a8 5ҩk uuu9=8YfDILGQlBF+wp(4 #Fo3vb 1?h0yG#$- x<1QBl%4ncW>)5ZCZՑFN)]B*Ti։W&ܣ}O7oE} ԕ"v{ t 2d%`DVtS8*N.S:ެ c_33\ PI˩;D%%ΔQlQ /n ]BĤ,;)Rv Ƕ E[ mK*aD6C vnұdm0v fH7X-:F+2{?A
K K}/0NQ1qNl9Ҹkܕ,^8w`} y%W,}
-K?EҗG=V3\KGTbfj
-vPqEjzUVLs
-@ 5:4Rqp+4.TԌ|OCp?X6Fy{}:?Mjvz.)jckpb+hRְ$Kzbz:O
1X;\pEk=$ YZ!#:QzSgOz#n.7 ?W */6J ߓH ~X ⷁل6(yKpD'-bu ];i*iq iC5'>5|[9^Ⱦ W(vAt
(Va at ݅N?ܹO}aߣ⤋n ^+k {řa6{}rA6pglH_Jkd!3Tw$W ]wFh/i_b9߁ btv0D75uat2&I ~Hrtq_q;Bݣu dMGf*gfjTp|=*bqхwђ *y -^gW>G%ڵ lUWO!rX[\T%r+SXjr"
ko9ߤ_9/WLo!L:]Cl}89$
^! sbw#{RNЙCMqC 3@qjv]?r*.דZ{Q@Gj(.21HwP
51I[8ҕ],|, nLߍ DvZjcDQjBDd'v6B
JkB5[g;FQ&z, `f X<ݓe3sm Y)#M kAS@>jIp ODӪR4>bkhk[0JwjkRyB!,['7l8dN' q0ۜ
-I9Hyûa[C).2M
-/Cf[9H=s35[^Ѱ-SWpn[,yذ*jW b612IWmeD2[ pYk 5sne%K ?\ŻYW9Fj"w
-A,(bt99xHhIpxHR:yז2@5oW G/fc>m n7(ў~_Z,xŵu3}u9 N5\e]ʥX ou9ƕ 4}M?-G[*mbV*fs] \:0Oq؇O#Α{w쀈I#zt
0Ukq!:pج vOްM,uxOکWw5we x i/jF^9J7"& Pa>ǀ>:f'Os(g \,F2l(qrdž
-Ĭܸ
j,KlSjj?\ڛ
67إ=N9)~ٳWHNG,6VQ nxj/ "]=(^!ak%(] .//=]4xθj 7 ] =
oggK4G{JWՏtsk>[T597IZ*LSzsiR 6:| [vuNГ{\}?VxI#dￜxI4UR_ .~#y7M`GPaZ-)SM"J"jL(5<܅00T3#Ó#3m L2ɐm:C/ou#))k{4 g,9qd``~0
-0āI1S01$ޏ _;`| F 7`胱(;# Ήaoϊ{`8ƽ0y5>
-stream
-xZ t řLϡ5贬K6>6 Y!$rK!\ !C @],dl6 },E"nU}_WnG)3߷{/< a?7xm}G[y`8#? 7+= >:?{ZEQ ?|$ ;uG?pB_[w?ؿS'J!oG Wţ+@GOFQL-_\~Smj@GoVz/8GQ&ыb=I9)-YEهrZ~V|_qY٩ ߛov#TQ]PߣPӫ_?Vzݣֿc61qEgzCsi
T@ DpoQMGeJMwBYh/Qy*F= COy:豛Ԕw8
,9xSd_ ȋ{eNS)&"%D
"Y:Rr4tG^D8.#IK(mB3&E0;"`v*hxl;,,W6z'OnoduVoecO6i4 90ZM6`ZL뢆EVCdm`{=,)AH5~ue>kI4M68suꀏ86
P ^FX $ Om:>H ~[ÑhY賡OMNΌ՞G[GR 9 ,N6D"2p@/R2DFEXs,>V!dW }v澙+R
mˉ'
-l nږNo-]ㄟ;Yswt 쀆LTSY5`XT zQaTӮLw.W ʇ;\ށ(ro c(5!_<`ҀS7SJCƙURLVa;#%
^cb>7pJmjp96vL癤݇zg
dPQ+QVkY!0T7!0Pcs7s*s 6i35pD%֦cB7ָLpkͪYt9EjX|ŧxz]1ZtC`ıU-|$(Sh,۞ijWݟi C%ڼx@a g(Ôv: O:A/]tlڭYj:fP'rc&'瘈'C; FL,>cI>^mV>LUa/|x0AKe
-A=8JOĆ bx$2H{D*|nB"o˿B uQ0=Lx<5q"+ˢW{hv⟐Q$26A@r"_E7Z\ *VLJ)=Ahw!>C_JBZEgU'}0+c9{s 9ഏ!*iI#8_z| t@混'gr?3%} S/dRInмugC ;_l2!R&q'syEVڈNR]'RfjW$ DŽ8
po EQ&*N jIDpRTJxd6$-.מ2-We;;}TO9ӶL.j
-km1ǔe6ZL1#hֿޗƋ0()*O=7*z羅.64~[zt YCm+)#֚5d .$JF.m 綛̱Z֗&vXiWmWцM)kHN7فpp fQڔK$V't+(t W
bB@ *1
-BZT0 0%j Ta8
Q4逷V^3!@Z$~2[ -t-|a*%@? ˻XIr9]!y( Oer1&RƯs}tHWD7D5niDj[-$2Ql'6Ak#f\6)[F"ha}5gvjf߸"t_0xbNgc(8b .G[I c AU%XeKc,W
̗('_5ה, rB21tJ+W i?
PCԳC韁 TQ|&ե%"%'O#3[wtlxKˁ]ӱ4eUN<-/)B*;(DcxbӻrF!a9B L PPNЬcD.\uYj@\*Ǖ6p'&Ģ#:S#V;5o~ mM [}>{8I/pQTk/ YåJYHv#.FFPp2*(9ıx8Fj^C/~uJa{?oC&{q9!FA^ΧDB^(icNc#!! S벨 -[XG iJI%>+Y cG*amH 9Rvݎ}=e%Dfb"5,3 Ĵ>/ϡp' ]J~ tLFq% ³Xe֫-¾R zLa}U)BR Eb_3YBmI߉֖O
ͽ[P?v ]~G5ۊ9d 6
-c#AK5!6V!Yߺ*6J)6:zQQwĸOmʶ M ;Tkjc_߭t5j7e=v[ɞ/"kMgM=z_dwV[5j-]ݒ}o15l}l|du}z*1,NwpzߍszWlƅk67/1[X#` K [Q*qX3s,d)zD sV}X*Ȥ"T|3}ݭ[AStL8WqB&jh)G!nC8ԑ܆<5y|d dKaM+ٵCl}
3S @ xK ,{. O tЉ'Ѝ۔5+ EAoLTS$2_{Aϣd/R%=r"ė*r:R+l) Sb~Z*32w e⡂?u0_u_hj \%XM m/qn
lB4c# $Pz]BZׯkQ-:ÊwZWM㈅{ ,HU"ZvSH( x\
٣Cwa'Af*!R
-J"kW^|q{]9W;YU9Qfs;N}QPe
#lgkzXQg0ˈjEu̜u\vÅp
-<@wtTR"A2
p.pO.O }J3U䈄Gd
-F#j6.}}-y̭;q@Lg}\V$c_bݙ+觭Q <>S_2:*q?rU9YIJ B^[ ɰ
-W2[U_ShJ2~7 I֊UvU~D7jY,q -q%f YlھaS/v&u OTK8G.QBq,P |Ty陇UvXmQ5?w.lڵb]U4nq^/gbq'p;B̢T/S =ʰ
-ho<ةz7]B_
}G/aK=D :N
-]9`U|LS*b,A'Κ0uU{JaD#$OLFF} Ggk'щv nwG }~s &u5 iѬ&=͝\f}ѼXou
-A3yWB6BpT3H C fgH 2W8v#G\FHw0X
j{,QBu~+SZb0$jQUa s[ ,[ؚ+]KW&cc3ccD&>5663}x>?YD>?6 anXo 2g+z&bwu,\N( J fY|<5vs;3fɄZаɯKߡcI9-aRyd_u$ uڵaQٯ3ji|!h
±h?e Z}t4ސ F \[03 uL&]dӵWSsrhdDH2Cp@v g+:Uu4q*[R8y ]-| Z3wy"'A. *9/sLU
TQ&PD^E)Q( ZJ_!Dݽ}mٟ}.]nij+gu|ydbMg/eCwĂAO6
'E *9Z)rTT$9
--ϣWϟ/Πs33C30[(>C? Z_ }IJ|p ʷ p*Y^K$., N"oa9ϐ닗aF%uʜ]'ԭQ;z_PhF N7:+o౩U*_/a OS Z
-8Ah#u@;$<O
Z@BB
- p? 44k?³0/4M'`
-|$
-s8[ -V6)pSO!tZcv/ ܑH!0=.@'3`;22{ArfS<51u >'|iWozqdia0xI `Eѩ3ݮBcz_ 回e -X 0KБLLcgg;7fv5 | ˫ZM( QY@gFɣ3υ n[ h].
-endstream
-endobj
-5968 0 obj
-<<
-/Length 3070
-/Filter /FlateDecode
->>
-stream
-x]{G gvz^}Ͼ9W/w%$KCӴ)M"-T,%^uTH-Bx "Z(]j3gߌ/|MG#Ig6OBϗ8 ;oλOĹ >ob
- N{n^yNy܅ۡ=}s;.B&t({ _xk(sj}K !?9B|Ө{cFȷgY6nUnYܱyП3bE``k GG?EG=
--z=F?o 0Զ9l;L9C:XdNT8^+b/Âae yG8nG=?sϼx /=16oEu`:*iI`;uQb"6(I[kc''RIk mfz\AB2g-$v .Pb p6IxS M̼H"a$"\uD0 ivb>YJV$cA]P s l2F} 7&[Q
-CS'G eXaDↁ}~/fՙNmrhx< q̔ H`'} PHlpdvR2 AiamGU3m噑b.MxBT ڏ܃h^D Wx:\!rhE%4էiUzɾZp:$m.!SƠ(DX ŵj S1["#P|<廊=|NDd2c9?_R5/z #$X2$,a2uB#ڳP֮*u֪ǘ+Db1YA3$WkysW*u#Hdk 6awLI\ ]u8A (h67 ԛdNj `#!ʏ<| ײ2S=婢&5@JqA,GSy+n@V5xm)r, =>AIטo-|N\طx3_8+D2KZl 껨)$2sCEBn%dt
-AۻV{觤FD*G4r0::b3
64 DdkM!A 셔F_l ѮxV!?e^ 4Q
PC. Rj{+9eayt,ap0x
-/m<ϿqxM{9[6qU{Q܊oWܼ.fd:hCkc
- Գ Aj`x[5}7.8 HWZ8 (r; xSw f}b=bJ6GƘW!AX㉜(ǭIS ؽ?'ߜI␑}j"
-;w[3UUV;~@}|}-pzGҨu-cE)|kWTn So 6qՍ7 ƃ~ۈTmJҪԾU*evlWo^g h#"ѯ:S7UѤ+QM?zGaD$|95P[FD=}RkN;{imʕFqD&MGm@\{$.^iq&IIVҞ;1AU A
->߹;)P=! أQ2N&h* Wv4$ ƅf9e Wrx~ q Bg%mORX& y7 vkчsڀ?Ójd+CV l<,szH
0\m@"y.Tf?՚6G_ң^o!bπX yB
-'(އ~* 1rSG"q*~%ʎrG$ @yBEذLË©Hk"zPl O]y%pTd*4!95[=p:& _ᄧ7S@jcA/ozДϱWC-; [GI Lyݾ<d(JTd Y,uݾ?.Zϔ [@$/zp%zk|uu2nX;d{a} BǏ _rX|q [rݮٛ]"JKe 0Iܲe.BС F&nl~.?dH1X2#
-'\OavS)]\Z>
-stream
-xX} ]~wgvvgvvfgvvvi;glj` 31qHĎC*$ Ȩ Z
-GZ h+U6G*RJ
4of "οywv}~<ޓ H@7G/>0|
-b(ܘ_\C A !=ԓd|. p ̥ O}hehyh=$!jzުB;;7W츺'ky7?K+*c !ѣ$:y %G&L4~t]3C|!
oC;ď!G8
-Sv Sj mM1fm m03'Offp [K,ch 8_5 )Rkװ0X({?}&?[ IkR,Q GJFT6ͦMQUy:>skv]+-:ih҅JN*OxK;*`!l-V7n32:z:DY84! 08v9v h8v h8v9v2L߃Y.>z
- ~
-o?fa@ k[w.|') O='I&HJl wSս31)ˈ=,L7d=Q}zx?_J4s{~iMZnTXr Gq.\ >&!*EV4̝m Vವ:g[s8ރJDBLR?`ޓ JI5 S, ^>?[Z@hrej\=,8^AN`$IsBJw6q e#A7_! \
W@C7#-K +*mscwVUd!g(Pfp
-aky\;ُW3,O
-,g+ U-ܚeST3l5;}oW`z e( mܜK Dob!$ms!A;
-Ţ#j,kaPY^pui'L U3hsvA kQx=XN}
-QәNA:jNAڠSmЩ6Tt
:jTt
+ng:ՆEڰX6FUaz msrouYv01$ClJ*_U]|?h= 9+0).B}H8ߟʱ"p ˸ɉnT{8ӂab]}t>(ii2$WZ%h^p"ResOʪ!A_jE|Gh|
-Ne 4p 4 DYv&xf̧9ǔ`?xf`I _ecgF^-q̹MXZ`BL,
jΆo\aåfEMf^
-=}@Rk];M|f
-BH ]*(<# љ͟˹7mZ.rII/ __]\-Y
-2P4/˕$`rQuϚ='UI5fãhAb9G J;zt\炬w^Cp/k w܁w 8p܁w 8p܁w܁w92>nFRNʐ:Jh ]
->>
-startxref
-684442
-%%EOF
diff --git a/assets/device.png b/assets/device.png
deleted file mode 100644
index 0d51338..0000000
Binary files a/assets/device.png and /dev/null differ
diff --git a/assets/do.png b/assets/do.png
deleted file mode 100644
index 7eda7e0..0000000
Binary files a/assets/do.png and /dev/null differ
diff --git a/assets/email.png b/assets/email.png
deleted file mode 100644
index 6015d56..0000000
Binary files a/assets/email.png and /dev/null differ
diff --git a/assets/employee.png b/assets/employee.png
deleted file mode 100644
index d77f4c7..0000000
Binary files a/assets/employee.png and /dev/null differ
diff --git a/assets/eng_flag.png b/assets/eng_flag.png
deleted file mode 100755
index e8049d9..0000000
Binary files a/assets/eng_flag.png and /dev/null differ
diff --git a/assets/fonts/MyMMUnicodeUniversal.ttf b/assets/fonts/MyMMUnicodeUniversal.ttf
deleted file mode 100644
index 128085b..0000000
Binary files a/assets/fonts/MyMMUnicodeUniversal.ttf and /dev/null differ
diff --git a/assets/fonts/OpenSans-Regular.ttf b/assets/fonts/OpenSans-Regular.ttf
deleted file mode 100644
index 29bfd35..0000000
Binary files a/assets/fonts/OpenSans-Regular.ttf and /dev/null differ
diff --git a/assets/fonts/Work_Sans/WorkSans-Black.ttf b/assets/fonts/Work_Sans/WorkSans-Black.ttf
deleted file mode 100755
index 3f972d1..0000000
Binary files a/assets/fonts/Work_Sans/WorkSans-Black.ttf and /dev/null differ
diff --git a/assets/fonts/Work_Sans/WorkSans-Bold.ttf b/assets/fonts/Work_Sans/WorkSans-Bold.ttf
deleted file mode 100755
index 7718ada..0000000
Binary files a/assets/fonts/Work_Sans/WorkSans-Bold.ttf and /dev/null differ
diff --git a/assets/fonts/Work_Sans/WorkSans-ExtraBold.ttf b/assets/fonts/Work_Sans/WorkSans-ExtraBold.ttf
deleted file mode 100755
index e571099..0000000
Binary files a/assets/fonts/Work_Sans/WorkSans-ExtraBold.ttf and /dev/null differ
diff --git a/assets/fonts/Work_Sans/WorkSans-ExtraLight.ttf b/assets/fonts/Work_Sans/WorkSans-ExtraLight.ttf
deleted file mode 100755
index 3798fbe..0000000
Binary files a/assets/fonts/Work_Sans/WorkSans-ExtraLight.ttf and /dev/null differ
diff --git a/assets/fonts/Work_Sans/WorkSans-Light.ttf b/assets/fonts/Work_Sans/WorkSans-Light.ttf
deleted file mode 100755
index 8b03227..0000000
Binary files a/assets/fonts/Work_Sans/WorkSans-Light.ttf and /dev/null differ
diff --git a/assets/fonts/Work_Sans/WorkSans-Medium.ttf b/assets/fonts/Work_Sans/WorkSans-Medium.ttf
deleted file mode 100755
index 137cf56..0000000
Binary files a/assets/fonts/Work_Sans/WorkSans-Medium.ttf and /dev/null differ
diff --git a/assets/fonts/Work_Sans/WorkSans-Regular.ttf b/assets/fonts/Work_Sans/WorkSans-Regular.ttf
deleted file mode 100755
index ba11a2d..0000000
Binary files a/assets/fonts/Work_Sans/WorkSans-Regular.ttf and /dev/null differ
diff --git a/assets/fonts/Work_Sans/WorkSans-SemiBold.ttf b/assets/fonts/Work_Sans/WorkSans-SemiBold.ttf
deleted file mode 100755
index 5cefd7c..0000000
Binary files a/assets/fonts/Work_Sans/WorkSans-SemiBold.ttf and /dev/null differ
diff --git a/assets/fonts/Work_Sans/WorkSans-Thin.ttf b/assets/fonts/Work_Sans/WorkSans-Thin.ttf
deleted file mode 100755
index 47a06ef..0000000
Binary files a/assets/fonts/Work_Sans/WorkSans-Thin.ttf and /dev/null differ
diff --git a/assets/gender.png b/assets/gender.png
deleted file mode 100644
index 44e9de1..0000000
Binary files a/assets/gender.png and /dev/null differ
diff --git a/assets/img/bg.jpg b/assets/img/bg.jpg
deleted file mode 100644
index 993d5e4..0000000
Binary files a/assets/img/bg.jpg and /dev/null differ
diff --git a/assets/img/login_logo.png b/assets/img/login_logo.png
deleted file mode 100644
index 0531be9..0000000
Binary files a/assets/img/login_logo.png and /dev/null differ
diff --git a/assets/img/logo.png b/assets/img/logo.png
deleted file mode 100644
index 6254dd0..0000000
Binary files a/assets/img/logo.png and /dev/null differ
diff --git a/assets/inventory.png b/assets/inventory.png
deleted file mode 100644
index 5f1a3d1..0000000
Binary files a/assets/inventory.png and /dev/null differ
diff --git a/assets/licence.png b/assets/licence.png
deleted file mode 100644
index a742f69..0000000
Binary files a/assets/licence.png and /dev/null differ
diff --git a/assets/local/localization_mu.json b/assets/local/localization_mu.json
index b2b8251..8ef116b 100644
--- a/assets/local/localization_mu.json
+++ b/assets/local/localization_mu.json
@@ -153,6 +153,11 @@
"message.view.detail":"အသေးစိတ် ကြည့်ရန်",
"message.hint.input":"စာကို ဒီမှာ ရိုက်ထည့်ပါ...",
+ "boxes.name":"Boxes",
+ "boxes.title":"Boxes",
+ "boxes.new":"New Box",
+ "box.edit.title":"Edit Box",
+
"btn.save":"သိမ်းဆည်းရန်",
"btn.approve":"အတည်ပြုရန်",
"btn.delete":"ဖျက်ရန်",
diff --git a/assets/logo.png b/assets/logo.png
deleted file mode 100644
index 96a4619..0000000
Binary files a/assets/logo.png and /dev/null differ
diff --git a/assets/logo1 (copy).png b/assets/logo1 (copy).png
deleted file mode 100644
index 6254dd0..0000000
Binary files a/assets/logo1 (copy).png and /dev/null differ
diff --git a/assets/logo_btn.jpg b/assets/logo_btn.jpg
deleted file mode 100644
index 7368d49..0000000
Binary files a/assets/logo_btn.jpg and /dev/null differ
diff --git a/assets/logo_btn.png b/assets/logo_btn.png
deleted file mode 100644
index c3e37af..0000000
Binary files a/assets/logo_btn.png and /dev/null differ
diff --git a/assets/logo_title.png b/assets/logo_title.png
deleted file mode 100644
index 3ad5663..0000000
Binary files a/assets/logo_title.png and /dev/null differ
diff --git a/assets/manual.png b/assets/manual.png
deleted file mode 100644
index 6b9b54d..0000000
Binary files a/assets/manual.png and /dev/null differ
diff --git a/assets/message.png b/assets/message.png
deleted file mode 100644
index e8c3a17..0000000
Binary files a/assets/message.png and /dev/null differ
diff --git a/assets/my_file.json b/assets/my_file.json
deleted file mode 100644
index e69de29..0000000
diff --git a/assets/myan_flag.png b/assets/myan_flag.png
deleted file mode 100755
index a3ea115..0000000
Binary files a/assets/myan_flag.png and /dev/null differ
diff --git a/assets/page.png b/assets/page.png
deleted file mode 100755
index e608240..0000000
Binary files a/assets/page.png and /dev/null differ
diff --git a/assets/password.png b/assets/password.png
deleted file mode 100644
index d0a7e97..0000000
Binary files a/assets/password.png and /dev/null differ
diff --git a/assets/pay.png b/assets/pay.png
deleted file mode 100644
index 384d33c..0000000
Binary files a/assets/pay.png and /dev/null differ
diff --git a/assets/pdo.png b/assets/pdo.png
deleted file mode 100644
index 9203800..0000000
Binary files a/assets/pdo.png and /dev/null differ
diff --git a/assets/phone.png b/assets/phone.png
deleted file mode 100644
index 5e8b0f5..0000000
Binary files a/assets/phone.png and /dev/null differ
diff --git a/assets/photos/1.jpg b/assets/photos/1.jpg
deleted file mode 100644
index 3186d79..0000000
Binary files a/assets/photos/1.jpg and /dev/null differ
diff --git a/assets/photos/2.jpg b/assets/photos/2.jpg
deleted file mode 100644
index 9f0d8de..0000000
Binary files a/assets/photos/2.jpg and /dev/null differ
diff --git a/assets/photos/3.jpg b/assets/photos/3.jpg
deleted file mode 100644
index 504b6f3..0000000
Binary files a/assets/photos/3.jpg and /dev/null differ
diff --git a/assets/pin.png b/assets/pin.png
deleted file mode 100644
index 33de204..0000000
Binary files a/assets/pin.png and /dev/null differ
diff --git a/assets/product.png b/assets/product.png
deleted file mode 100644
index 45e3497..0000000
Binary files a/assets/product.png and /dev/null differ
diff --git a/assets/product_icon.png b/assets/product_icon.png
deleted file mode 100644
index 356510c..0000000
Binary files a/assets/product_icon.png and /dev/null differ
diff --git a/assets/quota.png b/assets/quota.png
deleted file mode 100644
index b5d057d..0000000
Binary files a/assets/quota.png and /dev/null differ
diff --git a/assets/r.jpg b/assets/r.jpg
deleted file mode 100644
index 1ca666a..0000000
Binary files a/assets/r.jpg and /dev/null differ
diff --git a/assets/reg.png b/assets/reg.png
deleted file mode 100644
index 01a2763..0000000
Binary files a/assets/reg.png and /dev/null differ
diff --git a/assets/report.png b/assets/report.png
deleted file mode 100644
index f5ea278..0000000
Binary files a/assets/report.png and /dev/null differ
diff --git a/assets/sales.png b/assets/sales.png
deleted file mode 100644
index e4ab266..0000000
Binary files a/assets/sales.png and /dev/null differ
diff --git a/assets/status.png b/assets/status.png
deleted file mode 100644
index d038e3f..0000000
Binary files a/assets/status.png and /dev/null differ
diff --git a/assets/storage.png b/assets/storage.png
deleted file mode 100644
index 686572c..0000000
Binary files a/assets/storage.png and /dev/null differ
diff --git a/assets/storage12.png b/assets/storage12.png
deleted file mode 100644
index 167f698..0000000
Binary files a/assets/storage12.png and /dev/null differ
diff --git a/assets/submission.png b/assets/submission.png
deleted file mode 100644
index 8c3a7ea..0000000
Binary files a/assets/submission.png and /dev/null differ
diff --git a/assets/term.png b/assets/term.png
deleted file mode 100644
index f460533..0000000
Binary files a/assets/term.png and /dev/null differ
diff --git a/assets/truck.png b/assets/truck.png
deleted file mode 100644
index e750a8e..0000000
Binary files a/assets/truck.png and /dev/null differ
diff --git a/assets/volume.png b/assets/volume.png
deleted file mode 100644
index 8549179..0000000
Binary files a/assets/volume.png and /dev/null differ
diff --git a/assets/whole.png b/assets/whole.png
deleted file mode 100644
index 6254dd0..0000000
Binary files a/assets/whole.png and /dev/null differ
diff --git a/lib/app.dart b/lib/app.dart
index 63d6f1c..ff2e77b 100644
--- a/lib/app.dart
+++ b/lib/app.dart
@@ -1,87 +1,45 @@
-import 'package:fcs/fcs/common/localization/app_translations_delegate.dart';
-import 'package:fcs/fcs/common/localization/transalation.dart';
-import 'package:fcs/fcs/common/pages/contact/model/contact_model.dart';
-import 'package:fcs/fcs/common/pages/customer/model/customer_model.dart';
-import 'package:fcs/fcs/common/pages/faq/model/faq_model.dart';
-import 'package:fcs/fcs/common/pages/initial_language_selection.dart';
-import 'package:fcs/fcs/common/pages/market/model/market_model.dart';
-import 'package:fcs/fcs/common/pages/model/language_model.dart';
-import 'package:fcs/fcs/common/pages/model/main_model.dart' as fcs;
-import 'package:fcs/fcs/common/pages/package/model/package_model.dart';
-import 'package:fcs/fcs/common/pages/package/model/shipment_model.dart';
-import 'package:fcs/fcs/common/pages/payment_methods/model/payment_method_model.dart';
-import 'package:fcs/fcs/common/pages/staff/model/staff_model.dart';
-import 'package:fcs/fcs/common/pages/term/model/term_model.dart';
-import 'package:fcs/model/buyer_model.dart';
-import 'package:fcs/model/delivery_model.dart';
-import 'package:fcs/model/discount_model.dart';
-import 'package:fcs/model/manual_model.dart';
-import 'package:fcs/model/notification_model.dart';
-import 'package:fcs/model/pd_model.dart';
-import 'package:fcs/model/reg_model.dart';
-import 'package:fcs/model/report_model.dart';
-import 'package:fcs/model/storage_model.dart';
-import 'package:fcs/model/test_model.dart';
-import 'package:fcs/pages/email_page.dart';
-import 'package:fcs/pages/login_page.dart';
+import 'package:fcs/localization/app_translations_delegate.dart';
+import 'package:fcs/localization/transalation.dart';
+import 'package:fcs/pages/box/model/box_model.dart';
+import 'package:fcs/pages/chat/model/message_model.dart';
+import 'package:fcs/pages/contact/model/contact_model.dart';
+import 'package:fcs/pages/customer/model/customer_model.dart';
+import 'package:fcs/pages/discount/model/discount_model.dart';
+import 'package:fcs/pages/faq/model/faq_model.dart';
+import 'package:fcs/pages/fcs_shipment/model/fcs_shipment_model.dart';
+import 'package:fcs/pages/main/home_page.dart';
+import 'package:fcs/pages/main/initial_language_selection.dart';
+import 'package:fcs/pages/invoice/model/invoice_model.dart';
+import 'package:fcs/pages/market/model/market_model.dart';
+import 'package:fcs/pages/main/model/language_model.dart';
+import 'package:fcs/pages/main/model/main_model.dart';
+import 'package:fcs/pages/package/model/package_model.dart';
+import 'package:fcs/pages/payment_methods/model/payment_method_model.dart';
+import 'package:fcs/pages/rates/model/shipment_rate_model.dart';
+import 'package:fcs/pages/shipment/model/pickup_model.dart';
+import 'package:fcs/pages/shipment_address/model/shipment_address_model.dart';
+import 'package:fcs/pages/main/splash_page.dart';
+import 'package:fcs/pages/staff/model/staff_model.dart';
+import 'package:fcs/pages/term/model/term_model.dart';
+import 'package:fcs/pages/main/welcome_page.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
-import 'package:flutter_local_notifications/flutter_local_notifications.dart';
import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:provider/provider.dart';
-import 'fcs/common/pages/chat/model/message_model.dart';
-import 'fcs/common/pages/home_page.dart';
-import 'fcs/common/pages/splash_page.dart';
-import 'fcs/common/pages/welcome_page.dart';
-import 'model/announcement_model.dart';
-import 'model/chart_model.dart';
-import 'model/device_model.dart';
-import 'model/do_model.dart';
-import 'model/invoice_model.dart';
-import 'model/log_model.dart';
-import 'model/main_model.dart';
-import 'model/pickup_model.dart';
-import 'model/po_model.dart';
-import 'model/product_model.dart';
-import 'model/report_user_model.dart';
-import 'model/shipment_rate_model.dart';
-import 'model/user_model.dart';
-import 'model_fcs/box_model.dart';
-import 'pages/term.dart';
-
class App extends StatefulWidget {
@override
_AppState createState() => _AppState();
}
class _AppState extends State {
- final fcs.MainModel mainModel2 = new fcs.MainModel();
+ final MainModel mainModel = new MainModel();
final ContactModel contactModel = new ContactModel();
final TermModel termModel = new TermModel();
- final MainModel mainModel = new MainModel();
final FAQModel faqModel = new FAQModel();
final PaymentMethodModel paymentMethodModel = new PaymentMethodModel();
-
- final UserModel userModel = new UserModel();
- final ProductModel productModel = new ProductModel();
- final POSubmissionModel poSubmissionModel = new POSubmissionModel();
- final DOModel doModel = new DOModel();
+ final FcsShipmentModel fcsShipmentModel = new FcsShipmentModel();
final LanguageModel lanuguageModel = new LanguageModel();
- final StorageModel storageModel = new StorageModel();
- final PDModel pdModel = new PDModel();
- final RegModel regModel = new RegModel();
- final BuyerModel buyerModel = new BuyerModel();
- final NotificationModel notificationModel = new NotificationModel();
- final ChartModel chartModel = new ChartModel();
- final DeliveryModel deliveryModel = new DeliveryModel();
- final ManualModel manualModel = new ManualModel();
- final TestModel testModel = new TestModel();
- final LogModel logModel = new LogModel();
- final PhoneDeviceModel phoneDeviceModel = new PhoneDeviceModel();
- final ReportModel reportModel = new ReportModel();
- final AnnouncementModel announcementModel = new AnnouncementModel();
- final ReportUserModel reportUserModel = new ReportUserModel();
final PickUpModel pickUpModel = new PickUpModel();
final ShipmentRateModel shipmentRateModel = new ShipmentRateModel();
final BoxModel boxModel = new BoxModel();
@@ -90,54 +48,31 @@ class _AppState extends State {
final CustomerModel customerModel = new CustomerModel();
final DiscountModel discountModel = new DiscountModel();
final StaffModel staffModel = new StaffModel();
- final ShipmentModel shipmentModel = new ShipmentModel();
+ final ShipmentAddressModel shipmentAddressModel = new ShipmentAddressModel();
final PackageModel packageModel = new PackageModel();
final MarketModel marketModel = new MarketModel();
AppTranslationsDelegate _newLocaleDelegate;
- static FlutterLocalNotificationsPlugin _flutterLocalNotificationsPlugin =
- FlutterLocalNotificationsPlugin();
@override
void initState() {
super.initState();
- mainModel2
+ mainModel
..addModel(customerModel)
..addModel(staffModel)
- ..addModel(shipmentModel)
+ ..addModel(shipmentAddressModel)
..addModel(packageModel)
..addModel(messageModel)
+ ..addModel(fcsShipmentModel)
+ ..addModel(discountModel)
+ ..addModel(shipmentRateModel)
+ ..addModel(boxModel)
+ ..addModel(pickUpModel)
+ ..addModel(invoiceModel)
..addModel(marketModel);
_newLocaleDelegate = AppTranslationsDelegate(newLocale: null);
Translation().onLocaleChanged = onLocaleChange;
- mainModel
- ..addModel(userModel)
- ..addModel(storageModel)
- ..addModel(regModel)
- ..addModel(poSubmissionModel)
- ..addModel(doModel)
- ..addModel(productModel)
- ..addModel(pdModel)
- ..addModel(buyerModel)
- ..addModel(notificationModel)
- ..addModel(chartModel)
- ..addModel(deliveryModel)
- ..addModel(logModel)
- ..addModel(manualModel)
- ..addModel(phoneDeviceModel)
- ..addModel(regModel)
- ..addModel(announcementModel)
- ..addModel(reportModel)
- ..addModel(testModel)
- ..addModel(reportUserModel)
- ..addModel(pickUpModel)
- ..addModel(shipmentRateModel)
- ..addModel(boxModel)
- ..addModel(shipmentRateModel)
- ..addModel(invoiceModel)
- ..addModel(discountModel);
- this.mainModel.init();
}
void onLocaleChange(Locale locale) {
@@ -151,11 +86,6 @@ class _AppState extends State {
'/': (_) => SplashScreen(),
'/welcome': (_) => WelcomePage(),
'/home': (_) => HomePage(),
- '/term': (context) => Term(
- agreePage: true,
- ),
- '/login': (context) => LoginPage(),
- '/email': (context) => EmailPage(),
'/language_selection': (context) => InitialLanguageSelectionPage(),
};
return routes;
@@ -166,40 +96,23 @@ class _AppState extends State {
return MultiProvider(
providers: [
ChangeNotifierProvider.value(value: mainModel),
- ChangeNotifierProvider.value(value: userModel),
- ChangeNotifierProvider.value(value: productModel),
ChangeNotifierProvider.value(value: staffModel),
- ChangeNotifierProvider.value(value: poSubmissionModel),
- ChangeNotifierProvider.value(value: doModel),
- ChangeNotifierProvider.value(value: storageModel),
- ChangeNotifierProvider.value(value: pdModel),
ChangeNotifierProvider.value(value: lanuguageModel),
- ChangeNotifierProvider.value(value: regModel),
- ChangeNotifierProvider.value(value: buyerModel),
- ChangeNotifierProvider.value(value: notificationModel),
- ChangeNotifierProvider.value(value: chartModel),
- ChangeNotifierProvider.value(value: deliveryModel),
- ChangeNotifierProvider.value(value: logModel),
- ChangeNotifierProvider.value(value: phoneDeviceModel),
- ChangeNotifierProvider.value(value: reportModel),
- ChangeNotifierProvider.value(value: announcementModel),
- ChangeNotifierProvider.value(value: reportUserModel),
ChangeNotifierProvider.value(value: pickUpModel),
ChangeNotifierProvider.value(value: shipmentRateModel),
- ChangeNotifierProvider.value(value: shipmentModel),
+ ChangeNotifierProvider.value(value: shipmentAddressModel),
ChangeNotifierProvider.value(value: packageModel),
ChangeNotifierProvider.value(value: boxModel),
ChangeNotifierProvider.value(value: messageModel),
ChangeNotifierProvider.value(value: invoiceModel),
ChangeNotifierProvider.value(value: customerModel),
ChangeNotifierProvider.value(value: discountModel),
- ChangeNotifierProvider.value(value: testModel),
- ChangeNotifierProvider.value(value: mainModel2),
ChangeNotifierProvider.value(value: contactModel),
ChangeNotifierProvider.value(value: termModel),
ChangeNotifierProvider.value(value: faqModel),
ChangeNotifierProvider.value(value: paymentMethodModel),
ChangeNotifierProvider.value(value: marketModel),
+ ChangeNotifierProvider.value(value: fcsShipmentModel),
],
child: Consumer(
builder: (context, value, child) {
@@ -224,9 +137,7 @@ class _AppState extends State {
routes: route(context),
localizationsDelegates: [
_newLocaleDelegate,
- //provides localised strings
GlobalMaterialLocalizations.delegate,
- //provides RTL support
GlobalWidgetsLocalizations.delegate,
],
supportedLocales: Translation().supportedLocales());
diff --git a/lib/charts/bar_chart.dart b/lib/charts/bar_chart.dart
deleted file mode 100644
index 19de245..0000000
--- a/lib/charts/bar_chart.dart
+++ /dev/null
@@ -1,120 +0,0 @@
-import 'package:charts_flutter/flutter.dart' as charts;
-import 'package:charts_flutter/flutter.dart';
-import 'package:flutter/material.dart';
-import 'package:intl/intl.dart';
-import 'package:provider/provider.dart';
-import 'package:fcs/charts/qtyby_customer_table.dart';
-import 'package:fcs/model/chart_model.dart';
-import 'package:fcs/model/product_model.dart';
-import 'package:fcs/fcs/common/helpers/theme.dart';
-import 'package:fcs/vo/po.dart';
-import 'package:fcs/widget/local_text.dart';
-
-class BarChart extends StatefulWidget {
- @override
- _BarChartState createState() => _BarChartState();
-}
-
-class _BarChartState extends State {
- static final numberFormatter = new NumberFormat("#,###");
- List chartSummary = new List();
- List> series;
-
- @override
- void initState() {
- super.initState();
- var chartModel = Provider.of(context, listen: false);
- this.chartSummary = chartModel.chartSummary;
- }
-
- @override
- Widget build(BuildContext context) {
- var productModel = Provider.of(context);
- if (this.chartSummary.isNotEmpty) {
- this.chartSummary.forEach((s) {
- productModel.products.forEach((p) {
- if (p.id == s.productID) {
- s.displayOrder = p.displayOrder;
- } else {
- return;
- }
- });
- });
-
- this
- .chartSummary
- .sort((s1, s2) => s1.displayOrder.compareTo(s2.displayOrder));
- }
- List> series = [
- charts.Series(
- id: "Subscribers",
- data: this.chartSummary,
- domainFn: (POChartData series, _) => series.productName,
- measureFn: (POChartData series, _) => series.balanceQty,
- colorFn: (POChartData series, _) =>
- charts.ColorUtil.fromDartColor(series.getColor),
- labelAccessorFn: (POChartData series, _) =>
- '${numberFormatter.format(series.balanceQty)}'),
- ];
-
- return Container(
- height: 200,
- child: Column(
- children: [
- Row(
- mainAxisAlignment: MainAxisAlignment.spaceBetween,
- children: [
- LocalText(context, 'product.balance_qty',
- color: primaryColor, fontSize: 16),
- IconButton(
- icon: Icon(
- Icons.refresh,
- color: primaryColor,
- ),
- onPressed: () {
- _load();
- },
- )
- ],
- ),
- Expanded(
- child: charts.BarChart(
- series,
- animate: true,
- vertical: false,
- defaultRenderer: new charts.BarRendererConfig(
- barRendererDecorator: new charts.BarLabelDecorator(
- labelPosition: charts.BarLabelPosition.auto,
- ),
- ),
- selectionModels: [
- SelectionModelConfig(changedListener: (SelectionModel model) {
- final selectedDatum = model.selectedDatum;
- if (selectedDatum.isNotEmpty) {
- selectedDatum.forEach((charts.SeriesDatum datumPair) {
- Navigator.push(
- context,
- MaterialPageRoute(
- builder: (context) => QtyByCustomerTable(
- poChartData: datumPair.datum,
- )),
- );
- });
- }
- })
- ],
- ),
- ),
- ],
- ),
- );
- }
-
- Future _load() async {
- var chartModel = Provider.of(context);
- var _s = await chartModel.loadSummary();
- setState(() {
- this.chartSummary = _s ?? [];
- });
- }
-}
diff --git a/lib/charts/delivery_do_line.dart b/lib/charts/delivery_do_line.dart
deleted file mode 100644
index 5e6bd38..0000000
--- a/lib/charts/delivery_do_line.dart
+++ /dev/null
@@ -1,84 +0,0 @@
-import 'package:charts_flutter/flutter.dart' as charts;
-import 'package:flutter/material.dart';
-import 'package:intl/intl.dart';
-import 'package:provider/provider.dart';
-import 'package:fcs/model/chart_model.dart';
-import 'package:fcs/fcs/common/helpers/theme.dart';
-import 'package:fcs/vo/revenue.dart';
-import 'package:fcs/widget/local_text.dart';
-
-import 'delivery_do_line_detail.dart';
-
-class DODeliveryLineChart extends StatefulWidget {
- @override
- _DODeliveryLineChartState createState() => _DODeliveryLineChartState();
-}
-
-class _DODeliveryLineChartState extends State {
- static final numberFormatter = new NumberFormat("#,###");
-
- @override
- void initState() {
- super.initState();
- }
-
- @override
- Widget build(BuildContext context) {
- var chartModel = Provider.of(context);
-
- List> series = [
- charts.Series(
- id: "Subscribers",
- data: chartModel.revenue.getDeliveryDo(),
- domainFn: (Data series, _) => series.date,
- measureFn: (Data series, _) => series.count,
- colorFn: (_, __) => charts.ColorUtil.fromDartColor(primaryColor),
- labelAccessorFn: (Data series, _) =>
- '${numberFormatter.format(series.count)}',
- ),
- ];
-
- return Container(
- height: 200,
- child: Column(
- children: [
- Row(
- mainAxisAlignment: MainAxisAlignment.spaceBetween,
- children: [
- LocalText(context, "delivery.do.title",
- color: primaryColor, fontSize: 16),
- InkWell(
- child: LocalText(
- context,
- "delivery.do.details",
- color: secondaryColor,
- fontSize: 14,
- ),
- onTap: () {
- Navigator.of(context).push(MaterialPageRoute(
- builder: (_) => DODeliveryLineDetail()));
- },
- ),
- ],
- ),
- Expanded(
- child: charts.TimeSeriesChart(
- series,
- animate: true,
- defaultRenderer: new charts.LineRendererConfig(
- includePoints: true,
- ),
- primaryMeasureAxis: new charts.NumericAxisSpec(
- tickProviderSpec: new charts.BasicNumericTickProviderSpec(
- zeroBound: false, desiredTickCount: 10),
- renderSpec: new charts.GridlineRendererSpec(
- lineStyle: charts.LineStyleSpec(
- dashPattern: [4, 4],
- ))),
- ),
- ),
- ],
- ),
- );
- }
-}
diff --git a/lib/charts/delivery_do_line_detail.dart b/lib/charts/delivery_do_line_detail.dart
deleted file mode 100644
index 5ef17d8..0000000
--- a/lib/charts/delivery_do_line_detail.dart
+++ /dev/null
@@ -1,85 +0,0 @@
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:intl/intl.dart';
-import 'package:provider/provider.dart';
-import 'package:fcs/model/chart_model.dart';
-import 'package:fcs/fcs/common/helpers/theme.dart';
-import 'package:fcs/vo/revenue.dart';
-import 'package:fcs/widget/local_text.dart';
-import 'package:fcs/widget/my_data_table.dart';
-import 'package:fcs/widget/progress.dart';
-
-class DODeliveryLineDetail extends StatefulWidget {
- const DODeliveryLineDetail();
- @override
- _DODeliveryLineDetailState createState() => _DODeliveryLineDetailState();
-}
-
-class _DODeliveryLineDetailState extends State {
- final numberFormatter = new NumberFormat("#,###");
- var dateFormatter = new DateFormat('dd MMM yyyy');
- bool _isLoading = false;
-
- @override
- void initState() {
- super.initState();
- }
-
- @override
- Widget build(BuildContext context) {
- var chartModel = Provider.of(context);
-
- return LocalProgress(
- inAsyncCall: _isLoading,
- child: Scaffold(
- appBar: AppBar(
- backgroundColor: primaryColor,
- title: LocalText(
- context,
- 'delivery.do.counts',
- color: Colors.white,
- fontSize: 18,
- ),
- ),
- body: Container(
- padding: EdgeInsets.only(top: 10),
- child: SingleChildScrollView(
- scrollDirection: Axis.vertical,
- child: SingleChildScrollView(
- scrollDirection: Axis.horizontal,
- padding: EdgeInsets.only(left: 20),
- child: MyDataTable(
- columnSpacing: 100,
- columns: [
- MyDataColumn(label: LocalText(context, "delivery.date")),
- MyDataColumn(label: LocalText(context, "delivery.do.count")),
- ],
- rows: getProductRow(chartModel.revenue.getDeliveryDo()),
- ),
- ),
- ),
- ),
- ),
- );
- }
-
- List getProductRow(List doList) {
- return doList.map((d) {
- var r = MyDataRow(
- cells: [
- MyDataCell(
- new Text(dateFormatter.format(d.date), style: textStyle),
- ),
- MyDataCell(
- new Text(
- numberFormatter.format(d.count),
- style: textStyle,
- ),
- ),
- ],
- );
-
- return r;
- }).toList();
- }
-}
diff --git a/lib/charts/delivery_do_summary.dart b/lib/charts/delivery_do_summary.dart
deleted file mode 100644
index 251bf6d..0000000
--- a/lib/charts/delivery_do_summary.dart
+++ /dev/null
@@ -1,79 +0,0 @@
-import 'package:charts_flutter/flutter.dart' as charts;
-import 'package:flutter/material.dart';
-import 'package:intl/intl.dart';
-import 'package:provider/provider.dart';
-import 'package:fcs/model/chart_model.dart';
-import 'package:fcs/fcs/common/helpers/theme.dart';
-import 'package:fcs/vo/revenue.dart';
-import 'package:fcs/widget/local_text.dart';
-
-import 'delivery_do_summary_details.dart';
-
-class DeliveryDoSummaryChart extends StatefulWidget {
- @override
- _DeliveryDoSummaryChartState createState() => _DeliveryDoSummaryChartState();
-}
-
-class _DeliveryDoSummaryChartState extends State {
- static final numberFormatter = new NumberFormat("#,###");
- var dateFormatter = new DateFormat('dd MMM yyyy');
-
- @override
- void initState() {
- super.initState();
- }
-
- @override
- Widget build(BuildContext context) {
- var chartModel = Provider.of(context);
-
- List> series = [
- charts.Series(
- id: "Subscribers",
- data: chartModel.revenue.getDeliveryDoSummary(),
- domainFn: (Data series, _) => "${series.totalDay}days",
- measureFn: (Data series, _) => series.totalCount,
- labelAccessorFn: (Data series, _) =>
- '${numberFormatter.format(series.totalCount)}'),
- ];
-
- return Container(
- height: 200,
- child: Column(
- children: [
- Row(
- mainAxisAlignment: MainAxisAlignment.spaceBetween,
- children: [
- LocalText(context, "delivery.do.summary",
- color: primaryColor, fontSize: 16),
- InkWell(
- child: LocalText(
- context,
- "delivery.do.details",
- color: secondaryColor,
- fontSize: 14,
- ),
- onTap: () {
- Navigator.of(context).push(MaterialPageRoute(
- builder: (_) => DeliveryDoSummaryDetail()));
- },
- ),
- ],
- ),
- Expanded(
- child: charts.BarChart(
- series,
- animate: true,
- vertical: false,
- defaultRenderer: new charts.BarRendererConfig(
- barRendererDecorator: new charts.BarLabelDecorator(
- labelPosition: charts.BarLabelPosition.auto,
- ),
- ),
- ),
- ),
- ],
- ),
- );
- }
-}
diff --git a/lib/charts/delivery_do_summary_details.dart b/lib/charts/delivery_do_summary_details.dart
deleted file mode 100644
index 5fa669a..0000000
--- a/lib/charts/delivery_do_summary_details.dart
+++ /dev/null
@@ -1,86 +0,0 @@
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:intl/intl.dart';
-import 'package:provider/provider.dart';
-import 'package:fcs/model/chart_model.dart';
-import 'package:fcs/fcs/common/helpers/theme.dart';
-import 'package:fcs/vo/revenue.dart';
-import 'package:fcs/widget/local_text.dart';
-import 'package:fcs/widget/my_data_table.dart';
-import 'package:fcs/widget/progress.dart';
-
-class DeliveryDoSummaryDetail extends StatefulWidget {
- const DeliveryDoSummaryDetail();
- @override
- _DeliveryDoSummaryDetailState createState() =>
- _DeliveryDoSummaryDetailState();
-}
-
-class _DeliveryDoSummaryDetailState extends State {
- final numberFormatter = new NumberFormat("#,###");
- var dateFormatter = new DateFormat('dd MMM yyyy');
- bool _isLoading = false;
-
- @override
- void initState() {
- super.initState();
- }
-
- @override
- Widget build(BuildContext context) {
- var chartModel = Provider.of(context);
-
- return LocalProgress(
- inAsyncCall: _isLoading,
- child: Scaffold(
- appBar: AppBar(
- backgroundColor: primaryColor,
- title: LocalText(
- context,
- 'delivery.do.sum.counts',
- color: Colors.white,
- fontSize: 18,
- ),
- ),
- body: Container(
- padding: EdgeInsets.only(top: 10),
- child: SingleChildScrollView(
- scrollDirection: Axis.vertical,
- child: SingleChildScrollView(
- scrollDirection: Axis.horizontal,
- padding: EdgeInsets.only(left: 20),
- child: MyDataTable(
- columnSpacing: 100,
- columns: [
- MyDataColumn(label: LocalText(context, "delivery.days")),
- MyDataColumn(label: LocalText(context, "delivery.do.count")),
- ],
- rows: getProductRow(chartModel.revenue.getDeliveryDoSummary()),
- ),
- ),
- ),
- ),
- ),
- );
- }
-
- List getProductRow(List doList) {
- return doList.map((d) {
- var r = MyDataRow(
- cells: [
- MyDataCell(
- new Text(d.totalDay.toString(), style: textStyle),
- ),
- MyDataCell(
- new Text(
- numberFormatter.format(d.totalCount),
- style: textStyle,
- ),
- ),
- ],
- );
-
- return r;
- }).toList();
- }
-}
diff --git a/lib/charts/delivery_line.dart b/lib/charts/delivery_line.dart
deleted file mode 100644
index 6d8f83d..0000000
--- a/lib/charts/delivery_line.dart
+++ /dev/null
@@ -1,107 +0,0 @@
-import 'package:charts_flutter/flutter.dart' as charts;
-import 'package:flutter/material.dart';
-import 'package:intl/intl.dart';
-import 'package:provider/provider.dart';
-import 'package:fcs/model/chart_model.dart';
-import 'package:fcs/fcs/common/helpers/theme.dart';
-import 'package:fcs/vo/revenue.dart';
-import 'package:fcs/widget/local_text.dart';
-
-import 'delivery_line_data.dart';
-
-class DeliveryBarChart extends StatefulWidget {
- @override
- _DeliveryBarChartState createState() => _DeliveryBarChartState();
-}
-
-class _DeliveryBarChartState extends State {
- static final numberFormatter = new NumberFormat("#,###");
- var dateFormatter = new DateFormat('dd MMM yyyy');
-
- @override
- void initState() {
- super.initState();
- }
-
- @override
- Widget build(BuildContext context) {
- var chartModel = Provider.of(context);
-
- List> series = [
- charts.Series(
- id: "Subscribers",
- data: chartModel.revenue.getDelivery(),
- domainFn: (Data series, _) =>
- "${series.date.day}-${series.date.month}-${series.date.year}",
- measureFn: (Data series, _) => series.amount,
- labelAccessorFn: (Data series, _) =>
- '${numberFormatter.format(series.amount)}'),
- ];
-
- List> seriesLine = [
- charts.Series(
- id: "Subscribers",
- data: chartModel.revenue.getDelivery(),
- domainFn: (Data series, _) => series.date,
- measureFn: (Data series, _) => series.amount,
- colorFn: (_, __) => charts.ColorUtil.fromDartColor(primaryColor),
- labelAccessorFn: (Data series, _) =>
- '${numberFormatter.format(series.amount)}',
- ),
- ];
-
- return Container(
- height: 200,
- child: Column(
- children: [
- Row(
- mainAxisAlignment: MainAxisAlignment.spaceBetween,
- children: [
- LocalText(context, "delivery", color: primaryColor, fontSize: 16),
- InkWell(
- child: LocalText(
- context,
- "delivery.detail",
- color: secondaryColor,
- fontSize: 14,
- ),
- onTap: () {
- Navigator.of(context).push(
- MaterialPageRoute(builder: (_) => DeliveryBarData()));
- },
- ),
- ],
- ),
- Expanded(
- child: charts.TimeSeriesChart(
- seriesLine,
- animate: true,
- defaultRenderer: new charts.LineRendererConfig(
- includePoints: true,
- ),
- primaryMeasureAxis: new charts.NumericAxisSpec(
- tickProviderSpec: new charts.BasicNumericTickProviderSpec(
- zeroBound: false, desiredTickCount: 10),
- renderSpec: new charts.GridlineRendererSpec(
- lineStyle: charts.LineStyleSpec(
- dashPattern: [4, 4],
- ))),
- ),
- ),
- // Expanded(
- // child: charts.BarChart(
- // series,
- // animate: true,
- // vertical: true,
- // defaultRenderer: new charts.BarRendererConfig(
- // barRendererDecorator: new charts.BarLabelDecorator(
- // labelPosition: charts.BarLabelPosition.auto,
- // ),
- // ),
- // ),
- // ),
- ],
- ),
- );
- }
-}
diff --git a/lib/charts/delivery_line_data.dart b/lib/charts/delivery_line_data.dart
deleted file mode 100644
index 634a6a3..0000000
--- a/lib/charts/delivery_line_data.dart
+++ /dev/null
@@ -1,91 +0,0 @@
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:intl/intl.dart';
-import 'package:provider/provider.dart';
-import 'package:fcs/model/chart_model.dart';
-import 'package:fcs/model/main_model.dart';
-import 'package:fcs/fcs/common/helpers/theme.dart';
-import 'package:fcs/vo/revenue.dart';
-import 'package:fcs/widget/local_text.dart';
-import 'package:fcs/widget/my_data_table.dart';
-import 'package:fcs/widget/number_cell.dart';
-import 'package:fcs/widget/progress.dart';
-
-import 'delivery_line_detail.dart';
-
-class DeliveryBarData extends StatefulWidget {
- const DeliveryBarData();
- @override
- _DeliveryBarDataState createState() => _DeliveryBarDataState();
-}
-
-class _DeliveryBarDataState extends State {
- final numberFormatter = new NumberFormat("#,###");
- var dateFormatter = new DateFormat('dd MMM yyyy');
- bool _isLoading = false;
-
- @override
- void initState() {
- super.initState();
- }
-
- @override
- Widget build(BuildContext context) {
- var chartModel = Provider.of(context);
-
- return LocalProgress(
- inAsyncCall: _isLoading,
- child: Scaffold(
- appBar: AppBar(
- backgroundColor: primaryColor,
- title: LocalText(
- context,
- 'delivery.data.title',
- color: Colors.white,
- fontSize: 18,
- ),
- ),
- body: Container(
- padding: EdgeInsets.only(top: 10),
- child: SingleChildScrollView(
- scrollDirection: Axis.vertical,
- child: SingleChildScrollView(
- scrollDirection: Axis.horizontal,
- padding: EdgeInsets.only(left: 20),
- child: MyDataTable(
- columnSpacing: 100,
- columns: [
- MyDataColumn(label: LocalText(context, "delivery.date")),
- MyDataColumn(
- label: LocalText(context, "delivery.qty"), numeric: true),
- ],
- rows: getProductRow(chartModel.revenue.getDelivery()),
- ),
- ),
- ),
- ),
- ),
- );
- }
-
- List getProductRow(List doList) {
- return doList.map((d) {
- var r = MyDataRow(
- onSelectChanged: (bool selected) async {
- Navigator.push(
- context,
- MaterialPageRoute(builder: (context) => DeliveryBarDetail(d.date)),
- );
- },
- cells: [
- MyDataCell(
- new Text(dateFormatter.format(d.date), style: textStyle),
- ),
- MyDataCell(NumberCell(d.amount)),
- ],
- );
-
- return r;
- }).toList();
- }
-}
diff --git a/lib/charts/delivery_line_detail.dart b/lib/charts/delivery_line_detail.dart
deleted file mode 100644
index 211470b..0000000
--- a/lib/charts/delivery_line_detail.dart
+++ /dev/null
@@ -1,93 +0,0 @@
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:intl/intl.dart';
-import 'package:provider/provider.dart';
-import 'package:fcs/model/do_model.dart';
-import 'package:fcs/fcs/common/helpers/theme.dart';
-import 'package:fcs/vo/do.dart';
-import 'package:fcs/widget/local_text.dart';
-import 'package:fcs/widget/my_data_table.dart';
-import 'package:fcs/widget/number_cell.dart';
-import 'package:fcs/widget/progress.dart';
-
-class DeliveryBarDetail extends StatefulWidget {
- final DateTime date;
- const DeliveryBarDetail(this.date);
- @override
- _DeliveryBarDetailState createState() => _DeliveryBarDetailState();
-}
-
-class _DeliveryBarDetailState extends State {
- final numberFormatter = new NumberFormat("#,###");
- var dateFormatter = new DateFormat('dd-MMM-yyyy');
- bool _isLoading = false;
- List dos = [];
-
- @override
- void initState() {
- super.initState();
- DOModel dOModel = Provider.of(context, listen: false);
- dOModel.getDOForDelivery(widget.date).then((dos) {
- setState(() {
- this.dos = dos;
- });
- });
- }
-
- @override
- Widget build(BuildContext context) {
- return LocalProgress(
- inAsyncCall: _isLoading,
- child: Scaffold(
- appBar: AppBar(
- backgroundColor: primaryColor,
- title: LocalText(
- context,
- 'delivery.detail.title',
- translationVariables: [dateFormatter.format(widget.date)],
- color: Colors.white,
- fontSize: 18,
- ),
- ),
- body: Container(
- padding: EdgeInsets.only(top: 5),
- child: SingleChildScrollView(
- scrollDirection: Axis.vertical,
- child: SingleChildScrollView(
- scrollDirection: Axis.horizontal,
- padding: EdgeInsets.only(left: 3),
- child: MyDataTable(
- columnSpacing: 20,
- columns: [
- MyDataColumn(label: LocalText(context, "do.name")),
- MyDataColumn(label: LocalText(context, "do.do_num")),
- MyDataColumn(
- label: LocalText(context, "do.quantity"), numeric: true),
- ],
- rows: getProductRow(),
- ),
- ),
- ),
- ),
- ),
- );
- }
-
- List getProductRow() {
- return dos.map((d) {
- var r = MyDataRow(
- cells: [
- MyDataCell(
- new Text(d.userName, style: textStyle),
- ),
- MyDataCell(
- new Text(d.doNumber, style: textStyle),
- ),
- MyDataCell(NumberCell(d.totalQty)),
- ],
- );
-
- return r;
- }).toList();
- }
-}
diff --git a/lib/charts/delivery_summary.dart b/lib/charts/delivery_summary.dart
deleted file mode 100644
index 133563b..0000000
--- a/lib/charts/delivery_summary.dart
+++ /dev/null
@@ -1,78 +0,0 @@
-import 'package:charts_flutter/flutter.dart' as charts;
-import 'package:flutter/material.dart';
-import 'package:intl/intl.dart';
-import 'package:provider/provider.dart';
-import 'package:fcs/model/chart_model.dart';
-import 'package:fcs/fcs/common/helpers/theme.dart';
-import 'package:fcs/vo/revenue.dart';
-import 'package:fcs/widget/local_text.dart';
-import 'delivery_summary_detail.dart';
-
-class DeliverySummary extends StatefulWidget {
- @override
- _DeliverySummaryState createState() => _DeliverySummaryState();
-}
-
-class _DeliverySummaryState extends State {
- static final numberFormatter = new NumberFormat("#,###");
- var dateFormatter = new DateFormat('dd MMM yyyy');
-
- @override
- void initState() {
- super.initState();
- }
-
- @override
- Widget build(BuildContext context) {
- var chartModel = Provider.of(context);
-
- List> series = [
- charts.Series(
- id: "Subscribers",
- data: chartModel.revenue.getDeliverySummary(),
- domainFn: (Data series, _) => "${series.totalDay}days",
- measureFn: (Data series, _) => series.totalAmount,
- labelAccessorFn: (Data series, _) =>
- '${numberFormatter.format(series.totalAmount)}'),
- ];
-
- return Container(
- height: 200,
- child: Column(
- children: [
- Row(
- mainAxisAlignment: MainAxisAlignment.spaceBetween,
- children: [
- LocalText(context, "delivery.summary",
- color: primaryColor, fontSize: 16),
- InkWell(
- child: LocalText(
- context,
- "delivery.detail",
- color: secondaryColor,
- fontSize: 14,
- ),
- onTap: () {
- Navigator.of(context).push(MaterialPageRoute(
- builder: (_) => DeliverySummaryDetail()));
- },
- ),
- ],
- ),
- Expanded(
- child: charts.BarChart(
- series,
- animate: true,
- vertical: false,
- defaultRenderer: new charts.BarRendererConfig(
- barRendererDecorator: new charts.BarLabelDecorator(
- labelPosition: charts.BarLabelPosition.auto,
- ),
- ),
- ),
- ),
- ],
- ),
- );
- }
-}
diff --git a/lib/charts/delivery_summary_detail.dart b/lib/charts/delivery_summary_detail.dart
deleted file mode 100644
index 78ccad8..0000000
--- a/lib/charts/delivery_summary_detail.dart
+++ /dev/null
@@ -1,85 +0,0 @@
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:intl/intl.dart';
-import 'package:provider/provider.dart';
-import 'package:fcs/model/chart_model.dart';
-import 'package:fcs/fcs/common/helpers/theme.dart';
-import 'package:fcs/vo/revenue.dart';
-import 'package:fcs/widget/local_text.dart';
-import 'package:fcs/widget/my_data_table.dart';
-import 'package:fcs/widget/progress.dart';
-
-class DeliverySummaryDetail extends StatefulWidget {
- const DeliverySummaryDetail();
- @override
- _DeliverySummaryDetailState createState() => _DeliverySummaryDetailState();
-}
-
-class _DeliverySummaryDetailState extends State {
- final numberFormatter = new NumberFormat("#,###");
- var dateFormatter = new DateFormat('dd MMM yyyy');
- bool _isLoading = false;
-
- @override
- void initState() {
- super.initState();
- }
-
- @override
- Widget build(BuildContext context) {
- var chartModel = Provider.of(context);
-
- return LocalProgress(
- inAsyncCall: _isLoading,
- child: Scaffold(
- appBar: AppBar(
- backgroundColor: primaryColor,
- title: LocalText(
- context,
- 'delivery.sum.amounts',
- color: Colors.white,
- fontSize: 18,
- ),
- ),
- body: Container(
- padding: EdgeInsets.only(top: 10),
- child: SingleChildScrollView(
- scrollDirection: Axis.vertical,
- child: SingleChildScrollView(
- scrollDirection: Axis.horizontal,
- padding: EdgeInsets.only(left: 20),
- child: MyDataTable(
- columnSpacing: 100,
- columns: [
- MyDataColumn(label: LocalText(context, "delivery.days")),
- MyDataColumn(label: LocalText(context, "delivery.amount")),
- ],
- rows: getProductRow(chartModel.revenue.getDeliverySummary()),
- ),
- ),
- ),
- ),
- ),
- );
- }
-
- List getProductRow(List doList) {
- return doList.map((d) {
- var r = MyDataRow(
- cells: [
- MyDataCell(
- new Text(d.totalDay.toString(), style: textStyle),
- ),
- MyDataCell(
- new Text(
- numberFormatter.format(d.totalAmount),
- style: textStyle,
- ),
- ),
- ],
- );
-
- return r;
- }).toList();
- }
-}
diff --git a/lib/charts/do_line.dart b/lib/charts/do_line.dart
deleted file mode 100644
index 544ac65..0000000
--- a/lib/charts/do_line.dart
+++ /dev/null
@@ -1,156 +0,0 @@
-import 'package:charts_flutter/flutter.dart' as charts;
-import 'package:flutter/material.dart';
-import 'package:intl/intl.dart';
-import 'package:provider/provider.dart';
-import 'package:fcs/model/chart_model.dart';
-import 'package:fcs/fcs/common/helpers/theme.dart';
-import 'package:fcs/vo/po_do_count.dart';
-import 'package:fcs/widget/local_text.dart';
-
-import 'do_line_detail.dart';
-
-class DOLineChart extends StatefulWidget {
- @override
- _DOLineChartState createState() => _DOLineChartState();
-}
-
-class _DOLineChartState extends State {
- static final numberFormatter = new NumberFormat("#,###");
-
- @override
- void initState() {
- super.initState();
- }
-
- @override
- Widget build(BuildContext context) {
- var chartModel = Provider.of(context);
-
- List