From fd5b64ca32888ba68c09612450cb972dc82fe6cb Mon Sep 17 00:00:00 2001 From: chi Date: Wed, 31 Jan 2024 17:23:12 +0900 Subject: [PATCH] =?UTF-8?q?=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=EC=97=90=20major=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SubProject/FCOMMON/DataBaseManager.cs | 6 +- SubProject/FPJ0000/Project/fPartList.cs | 2 +- .../FPJ0000/Project/fProjectData.Designer.cs | 73 +++++++++++-------- SubProject/FPJ0000/Project/fProjectData.cs | 2 + SubProject/FPJ0000/Project/fProjectData.resx | 72 +++++------------- 5 files changed, 67 insertions(+), 88 deletions(-) diff --git a/SubProject/FCOMMON/DataBaseManager.cs b/SubProject/FCOMMON/DataBaseManager.cs index 4e04689..1c3dfda 100644 --- a/SubProject/FCOMMON/DataBaseManager.cs +++ b/SubProject/FCOMMON/DataBaseManager.cs @@ -174,9 +174,9 @@ namespace FCOMMON { var sql = " select " + - " isnull(sum(case when[state] = 'PR' then 0 when[state] = 'PO' then 0 when[state] = 'Received' then 0 when[state] = 'Cancled' then 0 else pumqty end),0) as Request," + - " isnull(sum(case when[state] = 'PR' then pumqtyReq else 0 end),0) as PR," + - " isnull(sum(case when[state] = 'PO' then pumqtyReq else 0 end),0) as PO," + + " isnull(sum(case when[state] = 'PR' then 0 when[state] = 'PO' then 0 when[state] = 'Received' then 0 when[state] = 'Cancled' then 0 else pumqtyreq end),0) as Request," + + " isnull(sum(case when[state] = 'PR' then pumqty else 0 end),0) as PR," + + " isnull(sum(case when[state] = 'PO' then pumqty else 0 end),0) as PO," + " isnull(sum(case when[state] = 'Received' then inqty else 0 end),0) as Received," + " isnull(sum(isnull(pumqty,pumqtyreq)),0) as Total_Request," + " isnull(sum(inqty),0) as Total_Buy," + diff --git a/SubProject/FPJ0000/Project/fPartList.cs b/SubProject/FPJ0000/Project/fPartList.cs index bc22f51..f777e54 100644 --- a/SubProject/FPJ0000/Project/fPartList.cs +++ b/SubProject/FPJ0000/Project/fPartList.cs @@ -231,7 +231,7 @@ namespace FPJ0000 FCOMMON.DBM.buyinfo sidinfo; if (v_sid.isEmpty() == false && v_sid.Length == 9 && v_sid.StartsWith("10")) { - if (v_sid == "108963609") + if (v_sid == "109017815") { } diff --git a/SubProject/FPJ0000/Project/fProjectData.Designer.cs b/SubProject/FPJ0000/Project/fProjectData.Designer.cs index b4c8dc2..9310830 100644 --- a/SubProject/FPJ0000/Project/fProjectData.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectData.Designer.cs @@ -56,10 +56,10 @@ System.Windows.Forms.Label label15; System.Windows.Forms.Label label16; System.Windows.Forms.Label label17; - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectData)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.Label label18; + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectData)); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.tbIdx = new System.Windows.Forms.TextBox(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsPRJ = new FPJ0000.dsPRJ(); @@ -113,6 +113,7 @@ this.cmbReqTeam = new System.Windows.Forms.ComboBox(); this.arLabel1 = new arCtl.arLabel(); this.panel1 = new System.Windows.Forms.Panel(); + this.textBox13 = new System.Windows.Forms.TextBox(); this.chkCostSave = new System.Windows.Forms.CheckBox(); this.chkHigh = new System.Windows.Forms.CheckBox(); this.tbPno = new System.Windows.Forms.TextBox(); @@ -226,7 +227,7 @@ this.taHist = new FPJ0000.dsPRJTableAdapters.ProjectsHistoryTableAdapter(); this.taHistD = new FPJ0000.dsPRJTableAdapters.EETGW_ProjecthistoryDTableAdapter(); this.taToDo = new FPJ0000.dsPRJTableAdapters.EETGW_ProjectToDoTableAdapter(); - this.textBox13 = new System.Windows.Forms.TextBox(); + this.chkMajor = new System.Windows.Forms.CheckBox(); nameLabel = new System.Windows.Forms.Label(); reqstaffLabel = new System.Windows.Forms.Label(); usermainLabel = new System.Windows.Forms.Label(); @@ -561,6 +562,16 @@ label17.TabIndex = 97; label17.Text = "Project No."; // + // label18 + // + label18.AutoSize = true; + label18.Location = new System.Drawing.Point(56, 169); + label18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label18.Name = "label18"; + label18.Size = new System.Drawing.Size(29, 12); + label18.TabIndex = 102; + label18.Text = "분류"; + // // tbIdx // this.tbIdx.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "idx", true)); @@ -935,8 +946,8 @@ // this.dataGridViewTextBoxColumn10.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; this.dataGridViewTextBoxColumn10.DataPropertyName = "remark"; - dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewTextBoxColumn10.DefaultCellStyle = dataGridViewCellStyle9; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewTextBoxColumn10.DefaultCellStyle = dataGridViewCellStyle1; this.dataGridViewTextBoxColumn10.HeaderText = "비고"; this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10"; this.dataGridViewTextBoxColumn10.ReadOnly = true; @@ -1140,6 +1151,7 @@ // panel1 // this.panel1.BackColor = System.Drawing.Color.Gainsboro; + this.panel1.Controls.Add(this.chkMajor); this.panel1.Controls.Add(label18); this.panel1.Controls.Add(this.textBox13); this.panel1.Controls.Add(this.chkCostSave); @@ -1176,10 +1188,20 @@ this.panel1.TabIndex = 86; this.panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.panel1_Paint); // + // textBox13 + // + this.textBox13.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "category", true)); + this.textBox13.Font = new System.Drawing.Font("굴림", 9F); + this.textBox13.ImeMode = System.Windows.Forms.ImeMode.Hangul; + this.textBox13.Location = new System.Drawing.Point(93, 165); + this.textBox13.Name = "textBox13"; + this.textBox13.Size = new System.Drawing.Size(139, 21); + this.textBox13.TabIndex = 101; + // // chkCostSave // this.chkCostSave.AutoSize = true; - this.chkCostSave.Location = new System.Drawing.Point(264, 122); + this.chkCostSave.Location = new System.Drawing.Point(244, 122); this.chkCostSave.Name = "chkCostSave"; this.chkCostSave.Size = new System.Drawing.Size(78, 16); this.chkCostSave.TabIndex = 100; @@ -1189,11 +1211,11 @@ // chkHigh // this.chkHigh.AutoSize = true; - this.chkHigh.Location = new System.Drawing.Point(173, 122); + this.chkHigh.Location = new System.Drawing.Point(170, 122); this.chkHigh.Name = "chkHigh"; - this.chkHigh.Size = new System.Drawing.Size(84, 16); + this.chkHigh.Size = new System.Drawing.Size(72, 16); this.chkHigh.TabIndex = 99; - this.chkHigh.Text = "Major Item"; + this.chkHigh.Text = "Highlight"; this.chkHigh.UseVisualStyleBackColor = true; // // tbPno @@ -2643,8 +2665,8 @@ // this.dataGridViewTextBoxColumn5.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; this.dataGridViewTextBoxColumn5.DataPropertyName = "remark"; - dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle10; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle2; this.dataGridViewTextBoxColumn5.HeaderText = "비고"; this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5"; this.dataGridViewTextBoxColumn5.ReadOnly = true; @@ -2881,25 +2903,15 @@ // this.taToDo.ClearBeforeFill = true; // - // label18 + // chkMajor // - label18.AutoSize = true; - label18.Location = new System.Drawing.Point(56, 169); - label18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - label18.Name = "label18"; - label18.Size = new System.Drawing.Size(29, 12); - label18.TabIndex = 102; - label18.Text = "분류"; - // - // textBox13 - // - this.textBox13.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "category", true)); - this.textBox13.Font = new System.Drawing.Font("굴림", 9F); - this.textBox13.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.textBox13.Location = new System.Drawing.Point(93, 165); - this.textBox13.Name = "textBox13"; - this.textBox13.Size = new System.Drawing.Size(139, 21); - this.textBox13.TabIndex = 101; + this.chkMajor.AutoSize = true; + this.chkMajor.Location = new System.Drawing.Point(326, 122); + this.chkMajor.Name = "chkMajor"; + this.chkMajor.Size = new System.Drawing.Size(56, 16); + this.chkMajor.TabIndex = 103; + this.chkMajor.Text = "Major"; + this.chkMajor.UseVisualStyleBackColor = true; // // fProjectData // @@ -3137,5 +3149,6 @@ private System.Windows.Forms.RichTextBox rtIntangle; private arCtl.arLabel arLabel7; private System.Windows.Forms.TextBox textBox13; + private System.Windows.Forms.CheckBox chkMajor; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectData.cs b/SubProject/FPJ0000/Project/fProjectData.cs index 5060792..7e22838 100644 --- a/SubProject/FPJ0000/Project/fProjectData.cs +++ b/SubProject/FPJ0000/Project/fProjectData.cs @@ -23,6 +23,7 @@ namespace FPJ0000 this.chkCostSave.Checked = pidx_.bCost; this.chkFanout.Checked = pidx_.bFanOut; this.chkHigh.Checked = pidx_.bHighlight; + this.chkMajor.Checked = pidx_.bmajoritem; } void ProjectsHistory_TableNewRow(object sender, DataTableNewRowEventArgs e) @@ -268,6 +269,7 @@ namespace FPJ0000 this.dr.bCost = chkCostSave.Checked; this.dr.bHighlight = chkHigh.Checked; + this.dr.bmajoritem = chkMajor.Checked; this.dr.bFanOut = chkFanout.Checked; diff --git a/SubProject/FPJ0000/Project/fProjectData.resx b/SubProject/FPJ0000/Project/fProjectData.resx index 5434a4f..3aad62e 100644 --- a/SubProject/FPJ0000/Project/fProjectData.resx +++ b/SubProject/FPJ0000/Project/fProjectData.resx @@ -198,8 +198,8 @@ False - - 100, 17 + + False 100, 17 @@ -207,9 +207,6 @@ 17, 17 - - 17, 17 - 299, 17 @@ -217,7 +214,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + vwAADr8BOAVTJAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA @@ -228,7 +225,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + vwAADr8BOAVTJAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC @@ -237,7 +234,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + vwAADr8BOAVTJAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f oAc0QjgAAAAASUVORK5CYII= @@ -246,7 +243,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + vwAADr8BOAVTJAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG @@ -362,58 +359,31 @@ 449, 17 - - 449, 17 - - - False - 676, 56 - - 676, 56 - - - 17, 56 - 17, 56 537, 56 - - 537, 56 - - - 398, 56 - 398, 56 259, 56 - - 259, 56 - 120, 56 - - 120, 56 - - - 566, 17 - 566, 17 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + vwAADr8BOAVTJAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA @@ -424,7 +394,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + vwAADr8BOAVTJAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC @@ -433,7 +403,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + vwAADr8BOAVTJAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f oAc0QjgAAAAASUVORK5CYII= @@ -442,7 +412,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + vwAADr8BOAVTJAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG @@ -453,7 +423,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC + vwAADr8BOAVTJAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++ Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA @@ -480,7 +450,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC + vwAADr8BOAVTJAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG @@ -489,12 +459,6 @@ bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII= - - 922, 17 - - - 722, 17 - 722, 17 @@ -504,7 +468,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + vwAADr8BOAVTJAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA @@ -515,7 +479,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + vwAADr8BOAVTJAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC @@ -524,7 +488,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + vwAADr8BOAVTJAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f oAc0QjgAAAAASUVORK5CYII= @@ -533,7 +497,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + vwAADr8BOAVTJAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG @@ -544,7 +508,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC + vwAADr8BOAVTJAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++ Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA @@ -571,7 +535,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC + vwAADr8BOAVTJAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG