プロジェクト

全般

プロフィール

リビジョン 286

堀内約7年前に追加

期限マスタメンテメッセージ変更
承認ルートマスタバグ修正
承認ルートマスタ:承認者区分定義追加

差分を表示:

branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs
14 14
        /// <summary>
15 15
        /// 本体バージョン
16 16
        /// </summary>
17
        public static int s_SystemVersion = 95;
17
        public static int s_SystemVersion = 97;
18 18

  
19 19
        /// <summary>
20 20
        /// コピー・環境バージョン
branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsApprovalPermission.cs
400 400
                        if (DataRec.PersonCode != MasterRec.ApprovalPerson) continue;
401 401

  
402 402
                        // 最終承認権限が設定されていれば承認済み
403
                        if (MasterRec.ApprovalAuthority == 1)
403
                        if (MasterRec.ApprovalAuthority == (int)ApprovalMaster.ApprovalAuthorityDef.LastApproval)
404 404
                        {
405 405
                            bApproval = true;
406 406
                            break;
branches/src/ProcessManagement/ProcessManagement/DataModel/ApprovalMaster.cs
10 10
    /// </summary>
11 11
    public class ApprovalMaster
12 12
    {
13
        #region 定数
14
        #region 承認権限区分
15
        /// <summary>
16
        /// 承認権限区分
17
        /// </summary>
18
        public enum ApprovalAuthorityDef
19
        {
20
            /// <summary>
21
            /// 0:通常承認者
22
            /// </summary>
23
            Normal = 0,
24
            /// <summary>
25
            /// 最終承認者
26
            /// </summary>
27
            LastApproval,
28
        }
29
        #endregion
30
        #endregion
31

  
13 32
        #region メンバ変数
14 33
        /// <summary>
15 34
        /// 承認機能番号
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionList.designer.cs
71 71
            this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
72 72
            this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
73 73
            this.Column11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
74
            this.pnlExample1 = new System.Windows.Forms.Panel();
75
            this.lblEstimateType03 = new System.Windows.Forms.Label();
76
            this.lblEstimateType02 = new System.Windows.Forms.Label();
77
            this.lblEstimateType01 = new System.Windows.Forms.Label();
74 78
            this.groupBox1.SuspendLayout();
75 79
            ((System.ComponentModel.ISupportInitialize)(this.numUDConstPro)).BeginInit();
76 80
            ((System.ComponentModel.ISupportInitialize)(this.dgvMaster)).BeginInit();
81
            this.pnlExample1.SuspendLayout();
77 82
            this.SuspendLayout();
78 83
            // 
79 84
            // btnDataEntry
......
159 164
            this.ProgressBar.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
160 165
            this.ProgressBar.Location = new System.Drawing.Point(10, 619);
161 166
            this.ProgressBar.Name = "ProgressBar";
162
            this.ProgressBar.Size = new System.Drawing.Size(388, 30);
167
            this.ProgressBar.Size = new System.Drawing.Size(400, 30);
163 168
            this.ProgressBar.TabIndex = 31;
164 169
            this.ProgressBar.Visible = false;
165 170
            // 
......
499 504
            this.Column11.Visible = false;
500 505
            this.Column11.Width = 5;
501 506
            // 
507
            // pnlExample1
508
            // 
509
            this.pnlExample1.BackColor = System.Drawing.Color.White;
510
            this.pnlExample1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
511
            this.pnlExample1.Controls.Add(this.lblEstimateType03);
512
            this.pnlExample1.Controls.Add(this.lblEstimateType02);
513
            this.pnlExample1.Controls.Add(this.lblEstimateType01);
514
            this.pnlExample1.Location = new System.Drawing.Point(10, 617);
515
            this.pnlExample1.Name = "pnlExample1";
516
            this.pnlExample1.Size = new System.Drawing.Size(400, 34);
517
            this.pnlExample1.TabIndex = 32;
518
            this.pnlExample1.Visible = false;
519
            // 
520
            // lblEstimateType03
521
            // 
522
            this.lblEstimateType03.BackColor = System.Drawing.Color.YellowGreen;
523
            this.lblEstimateType03.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
524
            this.lblEstimateType03.ForeColor = System.Drawing.Color.DarkRed;
525
            this.lblEstimateType03.Location = new System.Drawing.Point(262, 7);
526
            this.lblEstimateType03.Name = "lblEstimateType03";
527
            this.lblEstimateType03.Size = new System.Drawing.Size(120, 20);
528
            this.lblEstimateType03.TabIndex = 0;
529
            this.lblEstimateType03.Text = "予算取り案件";
530
            this.lblEstimateType03.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
531
            // 
532
            // lblEstimateType02
533
            // 
534
            this.lblEstimateType02.BackColor = System.Drawing.Color.DarkOrange;
535
            this.lblEstimateType02.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
536
            this.lblEstimateType02.ForeColor = System.Drawing.Color.Black;
537
            this.lblEstimateType02.Location = new System.Drawing.Point(134, 7);
538
            this.lblEstimateType02.Name = "lblEstimateType02";
539
            this.lblEstimateType02.Size = new System.Drawing.Size(120, 20);
540
            this.lblEstimateType02.TabIndex = 0;
541
            this.lblEstimateType02.Text = "入札案件";
542
            this.lblEstimateType02.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
543
            // 
544
            // lblEstimateType01
545
            // 
546
            this.lblEstimateType01.BackColor = System.Drawing.Color.OrangeRed;
547
            this.lblEstimateType01.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
548
            this.lblEstimateType01.ForeColor = System.Drawing.Color.DarkBlue;
549
            this.lblEstimateType01.Location = new System.Drawing.Point(6, 7);
550
            this.lblEstimateType01.Name = "lblEstimateType01";
551
            this.lblEstimateType01.Size = new System.Drawing.Size(120, 20);
552
            this.lblEstimateType01.TabIndex = 0;
553
            this.lblEstimateType01.Text = "工事案件";
554
            this.lblEstimateType01.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
555
            // 
502 556
            // FrmConstructionList
503 557
            // 
504 558
            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
......
506 560
            this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
507 561
            this.BackColor = System.Drawing.Color.Black;
508 562
            this.ClientSize = new System.Drawing.Size(1280, 657);
563
            this.Controls.Add(this.pnlExample1);
509 564
            this.Controls.Add(this.ProgressBar);
510 565
            this.Controls.Add(this.btnDataCopy);
511 566
            this.Controls.Add(this.lblProcessTitil);
......
530 585
            this.groupBox1.PerformLayout();
531 586
            ((System.ComponentModel.ISupportInitialize)(this.numUDConstPro)).EndInit();
532 587
            ((System.ComponentModel.ISupportInitialize)(this.dgvMaster)).EndInit();
588
            this.pnlExample1.ResumeLayout(false);
533 589
            this.ResumeLayout(false);
534 590

  
535 591
        }
......
566 622
        private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
567 623
        private System.Windows.Forms.DataGridViewTextBoxColumn Column2;
568 624
        private System.Windows.Forms.DataGridViewTextBoxColumn Column11;
625
        private System.Windows.Forms.Panel pnlExample1;
626
        private System.Windows.Forms.Label lblEstimateType03;
627
        private System.Windows.Forms.Label lblEstimateType02;
628
        private System.Windows.Forms.Label lblEstimateType01;
569 629
    }
570 630
}
branches/src/ProcessManagement/ProcessManagement/Forms/Master/ApprovalRoute/FrmApprovalDispAux.cs
86 86
                ArrayList ReadList = new ArrayList();
87 87
                if (!AppDB.ExecuteReader(strcmd.ToString(), ref ReadList)) return false;
88 88

  
89
                // 取得データを表示配列へセット
90
                ArrayList DispList = new ArrayList();
91
                CreateDispArray(ReadList, ref DispList);
89
                // 行毎の承認者数を取得する
90
                strcmd.Clear();
91
                strcmd.Append("Select count(*) As countA From approvalmaster Group by DepartmentCode, ApprovalCode Order by countA desc");
92
                ArrayList CntArray = new ArrayList();
93
                if (!AppDB.ExecuteReader(strcmd.ToString(), ref CntArray)) return false;
94
                object[] objCnt = null;
95
                if (CntArray.Count > 0) objCnt = (object[])CntArray[0];
92 96

  
93
                // 最初に承認者を6人分追加する
94
                CreateColumn(6);
97
                // 最初に承認者を6人セットする
98
                int AppManCnt = 6;
99
                if (CntArray.Count > 0 && CommonMotions.cnvInt(objCnt[0]) > AppManCnt) AppManCnt = CommonMotions.cnvInt(objCnt[0]);
95 100

  
96
                // データ表示
97
                int nDepCode = 0;
98
                int nAppCode = 0;
99
                ArrayList AppRowList = new ArrayList();
100
                foreach (object[] objwrk in DispList)
101
                {
102
                    // 部署が違えば部署名表示
103
                    if (nDepCode != CommonMotions.cnvInt(objwrk[(int)DispRecCol.DepartmentCode]))
104
                    {
105
                        if (nAppCode != 0) SetGridRowData(ref AppRowList);
106
                        SetGridDepTitile(objwrk);
107
                        nDepCode = CommonMotions.cnvInt(objwrk[0]);
108
                        m_nDataNo = 0;
109
                        nAppCode = 0;
110
                    }
111
                    if (nAppCode != CommonMotions.cnvInt(objwrk[(int)DispRecCol.ApprovalCode]))
112
                    {
113
                        if (nAppCode != 0) SetGridRowData(ref AppRowList);
114
                        nAppCode = CommonMotions.cnvInt(objwrk[(int)DispRecCol.ApprovalCode]);
115
                    }
101
                // 承認者列カラム作成
102
                CreateColumn(AppManCnt);
116 103

  
117
                    AppRowList.Add(objwrk);
118
                }
104
                // 取得データを表示
105
                CreateDispArray(ReadList);
119 106

  
120 107
                // タイトル行の色セット
121 108
                GridDepTitileColor();
......
140 127
        }
141 128
        #endregion
142 129

  
143
        #region 表示データ配列作成
130
        #region 表示処理
144 131
        /// <summary>
145
        /// 表示データ配列作成
132
        /// 表示処理
146 133
        /// </summary>
147 134
        /// <param name="ReadList"></param>
148 135
        /// <param name="DispList"></param>
149
        private void CreateDispArray(ArrayList ReadList, ref ArrayList DispList)
136
        private void CreateDispArray(ArrayList ReadList)
150 137
        {
151 138
            IOMDepartment DepDB = new IOMDepartment();
152 139
            try
153 140
            {
141
                DataGridView dgv = dgvProcess;
154 142
                StringBuilder strSQL = new StringBuilder();
155 143
                strSQL.Append(" Where DeleteFlg = 0");
156 144
                strSQL.Append(" Order by DisplayOrder");
157 145
                List<DepartmentMaster> DepList = new List<DepartmentMaster>();
158 146
                if (!DepDB.SelectAction(strSQL.ToString(), ref DepList)) return;
159 147

  
160
                int depCode = 0;
161
                int appCode = 0;
162
                int AddCnt = 0;
148
                int DispNo = 0;
149
                int AddRowCnt = 0;
150
                int AddColCnt = 0;
163 151
                foreach (DepartmentMaster DepRec in DepList)
164 152
                {
153
                    // 部署名セット
154
                    int RowCnt = dgv.Rows.Add(string.Empty
155
                                        , DepRec.DepartmentCode
156
                                        , string.Empty
157
                                        , string.Format(" {0}", DepRec.DepartmentString)
158
                                        );
159
                    DispNo = 1;
160

  
165 161
                    foreach (KeyValuePair<int, string> AppList in ClsExcute.AppovalList)
166 162
                    {
167
                        AddCnt = 0;
168
                        foreach (object[] objRec in ReadList)
163
                        // 対象データのみ取得
164
                        object[] objTergetList = ReadList.Cast<object[]>().Where(x => DepRec.DepartmentCode == CommonMotions.cnvInt(x[(int)DispRecCol.DepartmentCode])
165
                                                                                    && AppList.Key == CommonMotions.cnvInt(x[(int)DispRecCol.ApprovalCode]))
166
                                                                            .OrderBy(x => CommonMotions.cnvInt(x[(int)DispRecCol.ApprovalCode]))
167
                                                                            .OrderByDescending(x => CommonMotions.cnvInt(x[(int)DispRecCol.AppDispOrder]))
168
                                                                            .ToArray();
169
                        AddRowCnt = -1;
170
                        AddColCnt = Enum.GetNames(typeof(GridColumn)).Length;
171
                        foreach (object[] objRec in objTergetList)
169 172
                        {
170
                            depCode = CommonMotions.cnvInt(objRec[(int)DispRecCol.DepartmentCode]);
171
                            appCode = CommonMotions.cnvInt(objRec[(int)DispRecCol.ApprovalCode]);
172
                            // 部署が違う場合は処理しない
173
                            if (DepRec.DepartmentCode != depCode) continue;
174
                            // 承認コードが違う場合は処理しない
175
                            if (AppList.Key != appCode) continue;
173
                            // 1件目だけ承認名称を表示する
174
                            if (AddRowCnt < 0)
175
                            {
176
                                AddRowCnt = dgv.Rows.Add(DispNo,
177
                                                            CommonMotions.cnvInt(objRec[(int)DispRecCol.DepartmentCode]),
178
                                                            AppList.Key,
179
                                                            AppList.Value,
180
                                                            CommonMotions.cnvString(objRec[(int)DispRecCol.PersonName]));
181
                            }
182
                            else
183
                            {
184
                                // 2件目以降は承認者のみ表示する
185
                                dgv.Rows[AddRowCnt].Cells[AddColCnt].Value = CommonMotions.cnvString(objRec[(int)DispRecCol.PersonName]);
186
                            }
176 187

  
177
                            DispList.Add(new object[] { CommonMotions.cnvInt(objRec[(int)DispRecCol.DepartmentCode]),
178
                                                        CommonMotions.cnvString(objRec[(int)DispRecCol.DepartmentString]),
179
                                                        CommonMotions.cnvInt(objRec[(int)DispRecCol.DepDispOrder]),
180
                                                        CommonMotions.cnvInt(objRec[(int)DispRecCol.ApprovalCode]),
181
                                                        AppList.Value,
182
                                                        CommonMotions.cnvInt(objRec[(int)DispRecCol.ApprovalPerson]),
183
                                                        CommonMotions.cnvInt(objRec[(int)DispRecCol.ApprovalAuthority]),
184
                                                        CommonMotions.cnvInt(objRec[(int)DispRecCol.AppDispOrder]),
185
                                                        CommonMotions.cnvInt(objRec[(int)DispRecCol.PersonCode]),
186
                                                        CommonMotions.cnvString(objRec[(int)DispRecCol.PersonName]) });
187

  
188
                            AddCnt++;
188
                            // 最終承認者セット
189
                            SetAuthorityColor(dgv.Rows[AddRowCnt].Cells[AddColCnt], objRec);
190
                            
191
                            AddColCnt++;
189 192
                        }
190 193
                        // データがない場合は承認のみ追加
191
                        if (AddCnt == 0)
194
                        if (objTergetList.Count() == 0)
192 195
                        {
193
                            DispList.Add(new object[] { DepRec.DepartmentCode,
194
                                                        DepRec.DepartmentString,
195
                                                        0,
196
                                                        AppList.Key,
197
                                                        AppList.Value,
198
                                                        0,
199
                                                        0,
200
                                                        0,
201
                                                        0,
202
                                                        string.Empty });
196
                            dgv.Rows.Add(DispNo, DepRec.DepartmentCode, AppList.Key, AppList.Value);
203 197
                        }
198
                        DispNo++;
204 199
                    }
205 200
                }
206 201
            }
......
215 210
        }
216 211
        #endregion
217 212

  
218
        #region グリッド部署タイトルセット
213
        #region 最終承認者色をセルにセットする
219 214
        /// <summary>
220
        /// グリッド部署タイトルセット
215
        /// 最終承認者色をセルにセットする
221 216
        /// </summary>
222
        /// <param name="objrec"></param>
223
        private void SetGridDepTitile(object[] objrec)
217
        /// <param name="CurCell"></param>
218
        /// <param name="objCurRec"></param>
219
        private void SetAuthorityColor(DataGridViewCell CurCell, object[] objCurRec)
224 220
        {
225 221
            try
226 222
            {
227
                DataGridView dgv = dgvProcess;
223
                // 最終承認者チェック
224
                int AppKubun = CommonMotions.cnvInt(objCurRec[(int)DispRecCol.ApprovalAuthority]);
225
                if (AppKubun != (int)ApprovalMaster.ApprovalAuthorityDef.LastApproval) return;
228 226

  
229
                int RowCnt = dgv.Rows.Add(string.Empty
230
                                    , CommonMotions.cnvInt(objrec[(int)DispRecCol.DepartmentCode])
231
                                    , string.Empty
232
                                    , string.Format(" {0}", CommonMotions.cnvString(objrec[(int)DispRecCol.DepartmentString]))
233
                                    );
227
                // 色セット
228
                CurCell.Style.BackColor = s_LastApproval;
234 229
            }
235 230
            catch (Exception ex)
236 231
            {
......
271 266
        }
272 267
        #endregion
273 268

  
274
        private int m_nDataNo = 0;
275
        #region グリッドデータセット
269
        #region 承認者列カラム作成
276 270
        /// <summary>
277
        /// グリッドデータセット
271
        /// 承認者列カラム作成
278 272
        /// </summary>
279
        /// <param name="objrec"></param>
280
        private void SetGridRowData(ref ArrayList AppRowList)
281
        {
282
            try
283
            {
284
                DataGridView dgv = dgvProcess;
285
                int nRowCnt = 0;
286
                int nDataCnt = AppRowList.Count;
287
                int nColCnt = dgv.ColumnCount;
288
                int nColFixCnt = Enum.GetNames(typeof(GridColumn)).Length;
289

  
290
                // 承認者数が現在カラムを越えていれば先に増やしておく
291
                if (nColCnt < (nColFixCnt + nDataCnt))
292
                {
293
                    CreateColumn(nDataCnt);
294
                }
295
                // 行カウントアップ
296
                m_nDataNo++;
297
                // 承認者先頭列取得
298
                int ApprovalCnt=nColFixCnt;
299

  
300
                int nDepCode = 0;
301
                string DepartmentName = string.Empty;
302
                int nAppCode = 0;
303
                string ApprovalName = string.Empty;
304
                int AppPersonCode = 0;
305
                int ApprAuthority = -1;
306
                string PersonName = string.Empty;
307
                foreach (object[] objRec in AppRowList)
308
                {
309
                    nDepCode = CommonMotions.cnvInt(objRec[(int)DispRecCol.DepartmentCode]);
310
                    DepartmentName = string.Format(" {0}",CommonMotions.cnvString(objRec[(int)DispRecCol.DepartmentString]));
311
                    nAppCode = CommonMotions.cnvInt(objRec[(int)DispRecCol.ApprovalCode]);
312
                    ApprovalName = string.Format("  {0}",CommonMotions.cnvString(objRec[(int)DispRecCol.ApprovalName]));
313
                    AppPersonCode = CommonMotions.cnvInt(objRec[(int)DispRecCol.ApprovalPerson]);
314
                    ApprAuthority = CommonMotions.cnvInt(objRec[(int)DispRecCol.ApprovalAuthority]);
315
                    PersonName = CommonMotions.cnvString(objRec[(int)DispRecCol.PersonName]);
316

  
317
                    // 1回目は行追加
318
                    if (nRowCnt < 1)
319
                    {
320
                        nRowCnt = dgv.Rows.Add(m_nDataNo
321
                                            , nDepCode
322
                                            , nAppCode
323
                                            , ApprovalName
324
                                            );
325
                    }
326
                    // 承認者セット
327
                    dgv.Rows[nRowCnt].Cells[ApprovalCnt].Value = PersonName;
328
                    // 最終承認者セット
329
                    if (ApprAuthority != 0) dgv.Rows[nRowCnt].Cells[ApprovalCnt].Style.BackColor = s_LastApproval;
330
                    
331
                    ApprovalCnt++;
332
                }
333
                AppRowList.Clear();
334
            }
335
            catch (Exception ex)
336
            {
337
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
338
            }
339
        }
340
        #endregion
341

  
342
        #region 列カラム作成
343
        /// <summary>
344
        /// 列カラム作成
345
        /// </summary>
346 273
        private void CreateColumn(int NewCnt)
347 274
        {
348 275
            try
branches/src/ProcessManagement/ProcessManagement/Forms/Master/ApprovalRoute/FrmApprovalRoute.cs
502 502
                    AppRec.SeqNo = ++iDataCnt;
503 503
                    AppRec.DisplayOrder = iDataCnt;
504 504
                    AppRec.ApprovalPerson = CommonMotions.cnvInt(dgvGridData[(int)DispGridApproval.PersonCode, i].Value);
505
                    AppRec.ApprovalAuthority = 0;
506
                    if ((bool)dgvGridData[(int)DispGridApproval.Check, i].Value) AppRec.ApprovalAuthority = 1;
505
                    
506
                    AppRec.ApprovalAuthority = (int)ApprovalMaster.ApprovalAuthorityDef.Normal;
507
                    if ((bool)dgvGridData[(int)DispGridApproval.Check, i].Value)
508
                        AppRec.ApprovalAuthority = (int)ApprovalMaster.ApprovalAuthorityDef.LastApproval;
507 509

  
508 510
                    if(!AppMDB.InsertAction(AppRec, false)) return false;
509 511
                }
branches/src/ProcessManagement/ProcessManagement/Forms/Master/Term/FrmTerm.cs
1193 1193
                    }
1194 1194
                    switch (work.CheckSchdule)
1195 1195
                    {
1196
                        case 0:
1196
                        case (int)TermMaster.TermDateCheckTimingDef.CheckSchdule0:
1197 1197
                            wrkValue3 = rdB101.Text;
1198 1198
                            break;
1199
                        case 1:
1199
                        case (int)TermMaster.TermDateCheckTimingDef.CheckSchdule1:
1200 1200
                            wrkValue3 = rdB102.Text;
1201 1201
                            break;
1202
                        case 2:
1202
                        case (int)TermMaster.TermDateCheckTimingDef.CheckSchdule2:
1203 1203
                            wrkValue3 = rdB103.Text;
1204 1204
                            break;
1205
                        case 3:
1205
                        case (int)TermMaster.TermDateCheckTimingDef.CheckSchdule3:
1206 1206
                            wrkValue3 = rdB104.Text;
1207 1207
                            break;
1208 1208
                    }
branches/src/ProcessManagement/ProcessManagement/Forms/Master/Term/FrmTerm.designer.cs
288 288
            this.panel1.ForeColor = System.Drawing.Color.Black;
289 289
            this.panel1.Location = new System.Drawing.Point(153, 63);
290 290
            this.panel1.Name = "panel1";
291
            this.panel1.Size = new System.Drawing.Size(440, 24);
291
            this.panel1.Size = new System.Drawing.Size(460, 24);
292 292
            this.panel1.TabIndex = 29;
293 293
            // 
294 294
            // rdB104
295 295
            // 
296 296
            this.rdB104.AutoSize = true;
297 297
            this.rdB104.ForeColor = System.Drawing.Color.Black;
298
            this.rdB104.Location = new System.Drawing.Point(310, 4);
298
            this.rdB104.Location = new System.Drawing.Point(310, 3);
299 299
            this.rdB104.Name = "rdB104";
300
            this.rdB104.Size = new System.Drawing.Size(128, 20);
300
            this.rdB104.Size = new System.Drawing.Size(145, 20);
301 301
            this.rdB104.TabIndex = 0;
302 302
            this.rdB104.TabStop = true;
303
            this.rdB104.Text = "日以降継続";
303
            this.rdB104.Text = "経過日以降継続";
304 304
            this.rdB104.UseVisualStyleBackColor = true;
305 305
            this.rdB104.CheckedChanged += new System.EventHandler(this.RadioButton_CheckedChanged);
306 306
            // 
......
313 313
            this.rdB103.Size = new System.Drawing.Size(94, 20);
314 314
            this.rdB103.TabIndex = 0;
315 315
            this.rdB103.TabStop = true;
316
            this.rdB103.Text = "後日以降";
316
            this.rdB103.Text = "経過当日";
317 317
            this.rdB103.UseVisualStyleBackColor = true;
318 318
            this.rdB103.CheckedChanged += new System.EventHandler(this.RadioButton_CheckedChanged);
319 319
            // 
branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs
32 32
// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を 
33 33
// 既定値にすることができます:
34 34
// [assembly: AssemblyVersion("1.0.*")]
35
[assembly: AssemblyVersion("1.0.0.95")]
36
[assembly: AssemblyFileVersion("1.0.0.95")]
35
[assembly: AssemblyVersion("1.0.0.97")]
36
[assembly: AssemblyFileVersion("1.0.0.97")]
37 37
// Log4netを使用する
38 38
[assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)]

他の形式にエクスポート: Unified diff