From af72eceb4756072a849c711458d6b99bec9a9729 Mon Sep 17 00:00:00 2001 From: ngfrolov Date: Thu, 6 Apr 2023 16:20:21 +0500 Subject: [PATCH] nit report design fixes --- .../ProcessMapReportMakerService.cs | 2 +- .../ProcessMap/ProcessMapReportTemplate.xlsx | Bin 7628 -> 7785 bytes AsbCloudWebApi/Rest/ProcessMap.http | 8 +++++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/AsbCloudInfrastructure/Services/ProcessMap/ProcessMapReportMakerService.cs b/AsbCloudInfrastructure/Services/ProcessMap/ProcessMapReportMakerService.cs index 01f215ee..f4a1da24 100644 --- a/AsbCloudInfrastructure/Services/ProcessMap/ProcessMapReportMakerService.cs +++ b/AsbCloudInfrastructure/Services/ProcessMap/ProcessMapReportMakerService.cs @@ -15,7 +15,7 @@ namespace AsbCloudInfrastructure.Services.ProcessMap const int firstColumn = 2; const int lastColumn = 49; - const int headerRowsCount = 6; + const int headerRowsCount = 5; private readonly IProcessMapReportService processMapService; diff --git a/AsbCloudInfrastructure/Services/ProcessMap/ProcessMapReportTemplate.xlsx b/AsbCloudInfrastructure/Services/ProcessMap/ProcessMapReportTemplate.xlsx index 352ecbfabb3e3833dab496122e9b53602b5b3c91..a97e8e640777e200dbbfe3daa50a5cee4e71c953 100644 GIT binary patch delta 5145 zcmaJ_2T+sE)(${z_X>gaNx+ZvTu}c|A8+`9GH~nWz zLA;Xfe9fZk<)-Leozl1no<-S|l2dP7&|0+BggRu3%1xVW^0 z_e@RQ#dc~G=aL?Cg9}jb^Eu>_cIx*_c;JR$j_CJsc_JKJk?KaXoPQmg&dKPJ{FSPP zEb5?i0%gS@U2z5a<4!a^N>#2s?HAx)WyB+@l6t}eZXsuh-YYEq?qi74eR7J@3&>$N zp_P$gcvvhWfVm%&>2{q>y}^!+&fB7fYj>I^IP-p)HY5CgeRxiXQ9NEHr&wVmN^Fv&BI;bErlyeiKgR)hSgiiVU#NQ# z`3Nn*KT0ch*OR53G+-cVx+-(H<0D*4CN;b4DuEJ6n4wpLGtRPe^d3b4l~I6nu~)pz^Y+o|FqW^+*z~f)9fqh$&vn`emu2kV;_kdAkBxu8w$Oh(O0A##V8C zQ{*u0B&PC5-s|MZX>62-mA%b_*T`xPf4^a33+F-%9-I&f@FUTpWi^xXKc<_2_lea_4f|Hw|XUv`vR+Q!Ci z_?;JB(CX{=8dtNo0bhcqx+F}JC8qF2*Dae1QgLh@X3928m_ZGhBs1ouadhdc`%Fnc z!#ZlFMmrOA4l2zD|#gz*!x@PkZCadfF8Ll*~GIY23WjY^t>%*Qw=DxhJA z*XwHeY5B!cgzoyQUQ3;H*?O9y^<0H%Btkk!=M!{w)8gSRZ8m) zR?NGGgXufT9N=)@j@JV6#VW&dDqJ z&$gWp9+WDFoTZ1!w%A@Ym97P`6!{ z*Ua7AZHdd7DtH7GZZtR-$8JA1UmJ91wgi0ieFWM{$1~SGV(wmh9C&l8 zr4O%u)aB(=ndv7O^X{Tl+pqbtWc9`BDD(FS8fPwa#1cC#afGb@Vd7D{w1)2unr^Nj z38|lcN$OEI-?z6Zx|MhxJEUMKwyP(**1p>VTdRL%p&y}`@%yA8(1Pf{ve3Vi5RnNE z0u}~7nWC`sNXDt&i>xL)4knDe8fC*}vUYyXYqoy*^$)^gKM94KEWUYpWZuDEldB*7 z!dF_VCT2Rfel@1?(RWnQhPl=+ij8hY;g^ot4K~I>Jj$&djL)5_+sHi$OC{}i7E-s8 zJg@l1_fk&R!uPa#p*o%w>axS3Isul5l8>8KK@rv0r0Lu`Mnqf)3R!KvTlJ5gO7;RL zg4CrAOTO}BHwK!eQ@*gYUa3cmg zS~6SF>Qd$FY**L(JdTRMf{nQ6)huLamt4n3J-)s#6a2ZSKF-9w=Z}&9{L|dQ1=>e( z6rBN~r8XFHr{hKP$2eQk*EK9gJh>2CEvB*5>nyl^3ODw0j*>?LydeQu zdOJiEX5?kbqyeRIM-ej&Hj#2|%80XQlfms#8fOnl;#^`zP{%u?yBvF{A#~JXn5$CxH!ZSmgWV z`kJ1$p7V@tst`V)9Fl|xKMYeSN)uW|9M(L2lbg0Yf0(CwqRKt0Bd`kO@U7;EvLtx+ z@d`}nLG@G?H8$l1*?(Moqor2Fydvy#l+|DKCbWv#o6##IN;51KrdCnfH<#MbuG*WK z^`?ChNVE&J9{eI1{@O$=Vo+apJ(o4PHQ=ntE_K8~c0mt&j5COpN0xC8mY4Ggm#OfX zGuEhoYfV>%%eh3y6L$lwIcnT^kJf>EW$KeR+WJc`sd1Yu+N}5w3+&jbb7j*nlRk@M zq3Z}2|Z>A^a2S@T=_HTv~SJNjd znbY}`k>cr%mCONJe;xXL8h<%(u5gGM_EwULY{30zTFM*POmFzWw^*VOS1oig+4u+Y zENqlvt2Tn$h0RH0RcI?rJxa!^h1a0w%djckD>p*23JhMh5X&4=z(fcm6)L`^n5`UR z{ZNFM3Q7ci1QjBtUsg(o_$z^ia9X6_g7XOiFrstjfOG0z@X#WCBfln6lD?&{32N4i zC3iA)N7@ki3y>Pp8&eNFEBwI(-)1BBq}N5$)j}@>aM&erFc(FXF9_A-c<`rXCXy1o zw&+HW2yev(Gzv|}>s?z9#rY>3hORA&}HW6YeN@k}7p zKWGqE^NhJa%*=8z@ZV%VYk>H6kz^Yzkc_lf5-18{I9@=ExmAAuGHH_A*^oMtuBkS& zzDfSuq9otE$a^Aal3%hRizQv}1Gclr7fHVLvLR>CUSxsEX!HWmud4L>M+!A+dF`LZQFgypZODMd(l>}_wxY@?I3=GUVlyb zsII$oRy_lRaDJLsEUxsn?Hj{*E&^XAaC@%t{H zxa5AFj(XfaG{9`)Jv6{#B81r+sj~|o!ip6v&{lo{i>WxUh3D&t z8DuQtOSr$IKuj~yzp|7Q`WKS%6US-H(BHF@>X|k!4 zccY~3Qbx_DyAM!r19~9?Cb)`H?3?diy10!$VE+t)`0sZot)xM`ei7DyS zIuKj>9q^o{tl;-vVK@qyipzWBeXOFkM!lKa7b+@uM*dNv8BZ_1SqGgNLypB2j*q?K zm~s2rqv$H|p~-x9W+Ak3l)EvqsS^`x92z$Nt-m9)a?HX}*%nm^^hhjQolHuwkR>5g zGugPZ9UYR2-(?qj2D4!3UOZAqnYE7frB-yL-Ya(-*P>d>s^OeW$F}FHq2>8FEIA5L zryD`$r}Dr^oQqR+#TI^43jQlmI2chk?T1|T%)k9ezD9ZAP-$}VM&$_r>@OTM zFsFOR?b~U+XHO5>x4GjUCLgY}z`OO!U^~{nLGO0|dTMnUaeuu=2?7OQ{o|=+5^MudQ_!pX*b@=n|r}EJLQ2H;JU_fj!y62&>w}AfpSe1ayx`p}F$j zEaA#~R%#rT^Vfa{5|}_uGxf!nR8qVmsyO}Ck5mrd`FeG^L@Nqq4u|kVuA3dG^xNwtp(n}Gkac(R9W#L}h{{2CStx?_WQlKVBE_$d57A{ZH{E>Kfnskx z1t;(Je(L6=5^8r_>QJ@`a48JdzlsrfW;H+0lULHru+>bR72?6UC0Wy8+I0*6@it@G zg~)L}uD9#L)|u53C%cUd*FR3!xL+*rsA~phGla69nXfcU>v-R6?fF0{LVNhhMr=QG zb~`*DyHOoG{&>H_>7rlW_`^?}JtqQC#;v4=QKZ3ITR}|anIB!tzGS32wY0`~WwrNQ zIg_27=@?;&M@ri1{hpUpm1z_3toeD4!lr~q!L080mK#Q|{fK^7>t+iX?!H7I&?e-( zWdEnAg2S>104^<;X@Y;vV=UKp!Hvo~4uNl=)_=uY-Qj0+ljC{&W0;ClDg7i?=oi4|!&o!Mz2Kzh=w*%d1s6 zuF=|`hr!>92riW4vgz-Ue^w{7{|FKg=;66)@;gi(c{y3TUwY!~q>CaVhJya1p#&TL zGul}HfP%p|ZZJDe3{LY~43mSyiGvt$cj0`$Ex&V1j2Tx5g#-V+;NKo_?f?vbET|3x zfvg@r(8WG?!9x*@7{f>F-gM5npoJB7(gHpqe8NQkPQ=1A&C;g6vnG^ zXU4oj=Ak?>SpZ&+s5DG_1g}wRo!k<&64IJ_F(>VF4DT)ujrTJCPq<}|6V-H5)=+Fu zQ28IdXI!I!*Al(%8u;vlg_HVFnbHF0rpj25d{?e1u%fqK^EZ})=~$oOS9eGogn0L9 z*F)%L`t*&w`e+~fj0RAnX04!_S#Punp)9Ih;t6+^*gHuYwSaOWddc#hl*PmKquA|Xu>W>m*olHAC>6C{#-@D;_9_U~pjxI`j_C6#rI`W3*<;qw`9fzeN zBSPvn^y=bF+I^w;T4He1(}-8)`0YlO+;qsm!@|1Lp@=}W%10l`yb0(|?OHO1Slpdm zIM=Em%=0!0L3;^%2vFV;8*ntmMHU!YFCSA9=2ml^f2qzXb=P7LSwXkN=S!g6^=|i7 zXs~qBz==KNym-`mlHlW9<)tGGa-L?CW_`WsAf?^C=_@`ao?$T~^pbNPkv{LS zinv)*Q1}pIkhX>vt#~GG^tsl5x{8GOQQzx^RG+2No^DZGK;OhsdG+!kgA$LmV|P|^ zas#vJr}aaj%~0j8_X+&(zqa5(lG?!kw3I(zRd}ZQVWSix1UHkU1-yk~x!@D~ z{N@hD-nOkJwwN~q+h121I3kWy+45BNm<@q~$*eNqE{GOf+Z#(oHa708@Ye9O~#!rIj5JIQeILnM~^;* z;72^N9Hyv{=$71WQKfDyINgzULLQ%@ifd1_(b+v zH>)T8)TvrT{d$fLL6;2I_KIq+Ab;%dKboPAA@`nZ!^_wMTvtCmmGWWLYZMoyVNE*_vp_!pG ze7#)bj|F~UIRW~MLu=A^cOdf-6KJ0s%W`8Z;aY|V2V9)qHCk7j5f3Jx-1KA5nzB}S zL3W=`F94HW^r_L^wxbXK_zoJk`)FqUjEPZ%-{7!`4D;!*HdF0?7n3gQD$yy?40s)M z5$&3@tT9)MI1L?2z!Rhvq)D!g7?X2k5=x;RvQTi`w3E69@>O|g=}dZ3cS#Nu{}3- z^{Ko+U#`JPCSE$iwzqI$r^Htxw5r*8*SH6}<+f+plxPMHZIQ6WyfqwkQPXTaC#Hy~ zlJV2UBpVfk47A%&8wn~WNiY7GXNDF;C z4_X^L(39~KrFV4f=j>dh2tKf@wi}4@6|!;xUp*&Xpq%@reU-n}k(gI5ej`WY>z>keor80Yqm1|AN79+#(gYg=!ZsP@xX&2 zvhd4bd?YC ziTEuFg>8|QXZN8%4HWA7KP_uy^?xc(H>pJ(F~DV&0hB_y-=Ob}Lo)_ILwVRP^L zxy#rGas%>BC1UOz_Wl4{rH5wUIhb!y6nGcSZC`M7H#Qum{8DsPNEM5LlBNU?U}dFx zZ}B;eUpkZ9g39GLGa6J5&glTn3Uq zgIt7;Lg4(EbXT2V9mKv}&Qh2fZp}>1mn6A)@-OBj=0G1gQ5#o5;qOj;?B7x{7k#!Y zospy4<}=11{XDJ$G_Cq`iUTC~Bq>YBOskn?*))5=l|P5nW?%I8j|QXPn~ zVL`1!c3*nO4nhXH#nT5w@MYW)ec&)=3_1sARndqfI_!B!8`~wj9_WQRC7T`Up@Iyn z`zg+kEaz=AMD|&$k72{8g{`>0E%k=Ls|yC6;iW3X0xOSeqlH6tg>jA1daqO3qQ?2w zuBmS5i0`$`so{*V_m$15Au8lGqlvCaRmGLh`CkHYPx1YSnoSFFZ45Eyt~c*S&e*F? z+2hn2#;3%!JHs+ zT4@P8{?7I^)qZKlGrH;;O3$Z^*YI^Kg^aGYT$homfH9Bdcq;4YOFk5LjzyBKSPj8) zz8wyBP>a>cd=Q1fV9<8(;;p67Q<}rY-MvR(dW_Y!k@4yL9kzLA4!Sb1KTDxQjA7CX ziHS5`mZ}lJo5!imdFsk-Zp5X50sa17Iy!d%yL|UP7ceE&(AL zTm$!e-) zk`0%KP{!s5EmD%u-;#+2;6hOPpbBS+^-R;o(1b}k;tYp{(x?X=q)MN{PidCSlNZ*` z<7_bfB2Gubl{KY7jy>q@w>Cf)zCC-&TRCcgDZYI=vnrq5voajRYH!|W%j|_4?BVjN zAGI-%{J7GDS7en=@v##`CWttVC2UxGuXT9u<4s(sj7rcL7zx5{18cE)PPU4CwA%&q z!r->`Y3=gn>l{+MLby-CUpwUZS(AR?E>WxWf7=w6#6Paeh?^+NQrhNy22@^-Skv?; zK2jFM7kk5FW7rkRy>kdF+8TQ0jilYydud|TN&vFwO^LI2rIX24L-@L($pl z{y%J7`KNm0ZBox-6Nvf$=+9PdD%7z`yl7+y=wIToYD&f?| z>J+C1>JWB-&tP9w!^6lze;~~(wD4+^-LiR5qq-;KEH*i(@Ptj){-%krq4!Dube)8tkyP+QZl z-?n#^zq-ptA*h*7ayIP+v~Age8~RF+4KicIp!wMapO~>qS(sGs=9j}Ib3_6TxvW~& z(Wx<$LBtrgAdOnrN>hbRM2+Bf&+wCux}Udj#&^r%NO7D1X~orWn(5O#3ziu zWZSXo>-`pkE%@xcLoww&n%`pfNxGI8pnhn!_;77mwoIj;M82_&T$ZGrO}Zn4`iMNTN=Mwh(4%qRHv|!D{|W`dze0DMU4$Bg>ZWjZ&-=@EzWSQ zA>ge|@*5>VtYIzgETlbuI$O3MrsJ%36ld%j4+#8bC@EmL^Ty2<4t6><*4xz3lzhkr(zT+=w zu{FyfvR@WqR5EJKWWh<7203@P8yQd{M7B9G=oMM8VfpOC z656wzb`Ya3ht=(z0Y%q?l!dR&K>uy(@c{A*LStDcYk(12_QmlkA7e7 zA-ZpNev3sDaI9D!mY9z00@liDXw2_$?{N+7rLlh@5Ch|e^WV6pDV3}o>u>(sBu)kX zPabSQEr940Ud?1$k^oKWXfZ8dZ&K?&C1_TE6=Zdn-)ue_9+&fHZL|scOnA}Ap&4^8 zeah}b2q;cY6UFlmg6a>Yvq~K*nS9Hc81rxu$$>hwW#!8l=q(YVhH(GTgH7jaO0x4P zjdGp);-vq0S2!8Ln^27%Gs{;+_0xbiqFi0DlnPNegoAHJKhWyOsyb>Bhz>j&8DPqw z)Topzsi+zJ+D6@LbbE-55!W-uzoeefFmE(C?mCECK5A_{5}TfsEvaj|-gBIV?_X83 zrnvjNM`_{#n3E$hWnZ~vW!xUEhH5kltIuSX`Fz+NW^*#hC0bWG`+U9hgOomF{FVPe z4ggW|qWCd+aWtNZ>^^0S1fD=%BbYizWSfL(yKHhaU_oJb{$!>&)&KFkb^V~+XiZMa zZL#YwKDchnHAxG1eivKzq#Pf`HG@OO7r)p~%okQ2T9+Ik#}*2!mUaS`pZ~eVBqtFH zP>07 z3;CAsNHn5AX&l#U>O92&F#Ab=At6p;AWYh*R9~c=1O5ZpViJSBOyO8$SMGG7d{{O^ zCs~^qrOMHRP^~93P~ax)1R6(V{}v+6i;efV5ik@F&J?KWc&95hAp!ow#Nr(zV6#^Y zmJk96IA=xqjWBdECQv?Hjgrmz1bULh-aav!yL-C))GqxR^hed;+$hVk<;*2fAcgD` zJ$@m9wu=#k<+nyox<$3ulx39me3ZwkNy9epX^`fRa2qDp^QxT_xUDA{{W`k%*X%$ diff --git a/AsbCloudWebApi/Rest/ProcessMap.http b/AsbCloudWebApi/Rest/ProcessMap.http index 48c0b582..f1816d21 100644 --- a/AsbCloudWebApi/Rest/ProcessMap.http +++ b/AsbCloudWebApi/Rest/ProcessMap.http @@ -11,4 +11,10 @@ GET {{baseUrl}}/api/processMap/getDrillProcessMap/{{wellId}} Content-Type: {{contentType}} accept: */* Authorization: {{auth}} -l \ No newline at end of file + + +### +GET {{baseUrl}}/api/processMap/getReportFile/{{wellId}} +Content-Type: {{contentType}} +accept: */* +Authorization: {{auth}} \ No newline at end of file