リビジョン 171
工事・担当者承認申請バグ修正
メニュー・ログインタイトルフォント変更
branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs | ||
---|---|---|
14 | 14 |
/// <summary> |
15 | 15 |
/// 本体バージョン |
16 | 16 |
/// </summary> |
17 |
public static int s_SystemVersion = 40;
|
|
17 |
public static int s_SystemVersion = 41;
|
|
18 | 18 |
|
19 | 19 |
/// <summary> |
20 | 20 |
/// コピー・環境バージョン |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestInput/FrmRequestInputAuxiliary.cs | ||
---|---|---|
900 | 900 |
GetDepositData(); |
901 | 901 |
|
902 | 902 |
// 対象が結合子工事の場合 |
903 |
if (m_BaseConstructionBaseInfo.JoinFlg == 2)
|
|
903 |
if (m_BaseConstructionBaseInfo.JoinFlg == (int)CommonDefine.BaseInfoJoinFlg.JoinChildren)
|
|
904 | 904 |
{ |
905 | 905 |
GetConstructionLinkFromFluctuationCode(m_BaseConstructionBaseInfo.ConstructionCode, 1, ref m_nLeaderConstructionCode); |
906 | 906 |
} |
... | ... | |
1090 | 1090 |
List<int> lstMainConstructionCode = new List<int>(); |
1091 | 1091 |
|
1092 | 1092 |
// 結合フラグが結合(親)以外の場合 |
1093 |
if (m_BaseConstructionBaseInfo.JoinFlg != 1)
|
|
1093 |
if (m_BaseConstructionBaseInfo.JoinFlg != (int)CommonDefine.BaseInfoJoinFlg.JoinParent)
|
|
1094 | 1094 |
{ |
1095 | 1095 |
// 単独、結合(子)は、請求工事=本工事 |
1096 | 1096 |
lstMainConstructionCode.Add(m_ConstructionCode); |
branches/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmLogin.cs | ||
---|---|---|
271 | 271 |
// ------ ファイル情報取得 |
272 | 272 |
m_VersionInfo = FileVersionInfo.GetVersionInfo(System.Reflection.Assembly.GetExecutingAssembly().Location); |
273 | 273 |
|
274 |
// タイトルの表示 |
|
275 |
lblTitle.AutoSize = true; |
|
276 |
lblTitle.Text = ""; |
|
277 |
for (int i = 0; i < m_VersionInfo.ProductName.Length; i++) |
|
278 |
{ |
|
279 |
if (i != 0) lblTitle.Text += " "; |
|
280 |
lblTitle.Text += m_VersionInfo.ProductName.Substring(i, 1); |
|
281 |
} |
|
282 |
|
|
283 |
lblTitle.Text += " ロ グ イ ン"; |
|
284 |
|
|
285 | 274 |
Point TitlePoint = lblTitle.Location; |
286 |
Size TitleSize = lblTitle.Size; |
|
287 |
|
|
288 |
lblTitle.AutoSize = false; |
|
289 |
TitleSize.Height += 10; |
|
290 |
TitleSize.Width += 20; |
|
291 |
lblTitle.Size = TitleSize; |
|
292 |
TitlePoint.X -= 10; |
|
275 |
int nCenter = 760 / 2; |
|
276 |
TitlePoint.X = nCenter - (lblTitle.Width / 2); |
|
293 | 277 |
lblTitle.Location = TitlePoint; |
294 | 278 |
|
295 | 279 |
// コンボボックス初期処理 |
branches/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmLogin.designer.cs | ||
---|---|---|
74 | 74 |
// lblTitle |
75 | 75 |
// |
76 | 76 |
this.lblTitle.Anchor = System.Windows.Forms.AnchorStyles.Top; |
77 |
this.lblTitle.AutoSize = true; |
|
78 | 77 |
this.lblTitle.BackColor = System.Drawing.Color.Black; |
79 | 78 |
this.lblTitle.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; |
80 |
this.lblTitle.Font = new System.Drawing.Font("AR丸ゴシック体E", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
|
|
79 |
this.lblTitle.Font = new System.Drawing.Font("メイリオ", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
|
|
81 | 80 |
this.lblTitle.ForeColor = System.Drawing.Color.White; |
82 | 81 |
this.lblTitle.Location = new System.Drawing.Point(233, 6); |
83 | 82 |
this.lblTitle.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); |
84 | 83 |
this.lblTitle.Name = "lblTitle"; |
85 |
this.lblTitle.Size = new System.Drawing.Size(314, 18);
|
|
84 |
this.lblTitle.Size = new System.Drawing.Size(320, 26);
|
|
86 | 85 |
this.lblTitle.TabIndex = 7; |
87 | 86 |
this.lblTitle.Text = "現 場 監 督 秘 書 ロ グ イ ン"; |
88 | 87 |
this.lblTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; |
branches/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenu.Designer.cs | ||
---|---|---|
771 | 771 |
this.lblTitle.Anchor = System.Windows.Forms.AnchorStyles.Top; |
772 | 772 |
this.lblTitle.BackColor = System.Drawing.Color.White; |
773 | 773 |
this.lblTitle.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; |
774 |
this.lblTitle.Font = new System.Drawing.Font("AR丸ゴシック体E", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
|
|
774 |
this.lblTitle.Font = new System.Drawing.Font("メイリオ", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
|
|
775 | 775 |
this.lblTitle.ForeColor = System.Drawing.Color.Black; |
776 | 776 |
this.lblTitle.Location = new System.Drawing.Point(360, 10); |
777 | 777 |
this.lblTitle.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); |
branches/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenu.cs | ||
---|---|---|
1111 | 1111 |
{ |
1112 | 1112 |
try |
1113 | 1113 |
{ |
1114 |
|
|
1114 |
if (this.WindowState == FormWindowState.Minimized) |
|
1115 |
{ |
|
1116 |
// 最小化 |
|
1117 |
} |
|
1118 |
else if (this.WindowState == FormWindowState.Maximized) |
|
1119 |
{ |
|
1120 |
// 最大化 |
|
1121 |
CellSizeChangesWhenChangingScreenSize(false); |
|
1122 |
} |
|
1123 |
else if (this.WindowState == FormWindowState.Normal) |
|
1124 |
{ |
|
1125 |
// 標準化 |
|
1126 |
CellSizeChangesWhenChangingScreenSize(true); |
|
1127 |
} |
|
1115 | 1128 |
} |
1116 | 1129 |
catch (Exception ex) |
1117 | 1130 |
{ |
branches/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuAuxiliary.cs | ||
---|---|---|
1239 | 1239 |
} |
1240 | 1240 |
#endregion |
1241 | 1241 |
|
1242 |
#region 画面サイズ変更時 |
|
1243 |
/// <summary> |
|
1244 |
/// 画面サイズ変更時のセルサイズ変更 |
|
1245 |
/// </summary> |
|
1246 |
private void CellSizeChangesWhenChangingScreenSize(bool bNormal = true) |
|
1247 |
{ |
|
1248 |
try |
|
1249 |
{ |
|
1250 |
foreach (TabPage wrkPage in tabMenu.TabPages) |
|
1251 |
{ |
|
1252 |
TabPageSizeChange(wrkPage, bNormal); |
|
1253 |
} |
|
1254 |
} |
|
1255 |
catch (Exception ex) |
|
1256 |
{ |
|
1257 |
logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message); |
|
1258 |
} |
|
1259 |
} |
|
1260 |
#endregion |
|
1261 |
|
|
1242 | 1262 |
#region タブページグリッドセルサイス変更処理 |
1243 | 1263 |
/// <summary> |
1244 | 1264 |
/// タブページグリッドセルサイス変更処理 |
... | ... | |
2272 | 2292 |
DataGridView dgv = dgvApproval; |
2273 | 2293 |
try |
2274 | 2294 |
{ |
2295 |
// 行クリア |
|
2275 | 2296 |
dgv.Rows.Clear(); |
2276 | 2297 |
|
2277 | 2298 |
// ----- 工事案件毎に最大の承認を取得する |
... | ... | |
2381 | 2402 |
string strConstrName = string.Empty; |
2382 | 2403 |
DateTime ApprovalEntryDate = DateTime.MinValue; |
2383 | 2404 |
DateTime ApprovalLimitDates = DateTime.MinValue; |
2405 |
int m_DefColumn = Enum.GetNames(typeof(ConstrAppGridCount)).Length; |
|
2384 | 2406 |
|
2385 | 2407 |
// 先頭レコードを取得 |
2386 | 2408 |
foreach (object[] objwrk in BufferList) |
... | ... | |
2446 | 2468 |
Color SelColor =ClsExcute.ApprovalTypeColorList[iApprovalCode]; |
2447 | 2469 |
dgv.Rows[CurRowCnt].Cells[(int)ConstrAppGridCount.ApprovalName].Style.BackColor = SelColor; |
2448 | 2470 |
//dgv.Rows[CurRowCnt].Cells[(int)ConstrAppGridCount.ApprovalName].Style.ForeColor = CommonMotions.GetComplementaryColor(SelColor); |
2449 |
string wrkname = MenuTabName.First(x => x.Value.Equals((int)TabNameEnum.MentenanceMenu)).Key;
|
|
2471 |
string wrkname = MenuTabName.First(x => x.Value.Equals((int)TabNameEnum.ConstructApproval)).Key;
|
|
2450 | 2472 |
int Tabcount = MenuTabName[wrkname] - 1; |
2451 | 2473 |
|
2452 |
int ObjCurCount = 0; |
|
2453 | 2474 |
object[] objAuthorizer = null; |
2454 | 2475 |
// データセット |
2455 | 2476 |
for (int i = 0; i < BufferList.Count; i++) |
2456 | 2477 |
{ |
2457 | 2478 |
if (i == 0) objAuthorizer = (object[])BufferList[i]; |
2458 |
if ((ObjCurCount + 1) <= BufferList.Count) objAuthorizer = (object[])BufferList[ObjCurCount++];
|
|
2479 |
objAuthorizer = (object[])BufferList[i];
|
|
2459 | 2480 |
|
2460 |
// 承認機能番号・受付番号・工事番号が違えばブレイク |
|
2461 |
if ((iApprovalCode == CommonMotions.cnvInt(objAuthorizer[(int)ConstrAppDataList.ApprovalCode])) |
|
2462 |
&& (iOrderNo == CommonMotions.cnvInt(objAuthorizer[(int)ConstrAppDataList.OrderNo])) |
|
2463 |
&& (iConstructionCode == CommonMotions.cnvInt(objAuthorizer[(int)ConstrAppDataList.ConstructionCode]))) |
|
2464 |
{ |
|
2465 |
|
|
2466 |
} |
|
2467 |
else |
|
2468 |
{ |
|
2469 |
--ObjCurCount; |
|
2470 |
break; |
|
2471 |
} |
|
2472 |
|
|
2473 | 2481 |
iApprovalCode = CommonMotions.cnvInt(objAuthorizer[(int)ConstrAppDataList.ApprovalCode]); // 承認機能番号 |
2474 | 2482 |
iOrderNo = CommonMotions.cnvInt(objAuthorizer[(int)ConstrAppDataList.OrderNo]); // 受付番号 |
2475 | 2483 |
iConstructionCode = CommonMotions.cnvInt(objAuthorizer[(int)ConstrAppDataList.ConstructionCode]); // 工事番号 |
... | ... | |
2485 | 2493 |
// 列の幅 |
2486 | 2494 |
NewColumn.Width = dgv.Columns[((int)ConstrAppGridCount.ApprovalPerson1)].Width; |
2487 | 2495 |
int AllCellColumns = m_CellSize.GetLength(1); |
2488 |
int CurCellBaseCnt = (int)ConstrAppGridCount.ApprovalPerson1; |
|
2489 |
if (AllCellColumns > i) m_CellSize[Tabcount, CurCellBaseCnt + i] = dgv.Columns[((int)ConstrAppGridCount.ApprovalPerson1)].Width; |
|
2496 |
m_CellSize[Tabcount, (int)ConstrAppGridCount.ApprovalPerson1 + i] = dgv.Columns[((int)ConstrAppGridCount.ApprovalPerson1)].Width; |
|
2490 | 2497 |
// 列のアライメントセット |
2491 | 2498 |
NewColumn.DefaultCellStyle = dgv.Columns[((int)ConstrAppGridCount.ApprovalPerson1)].DefaultCellStyle; |
2492 | 2499 |
|
... | ... | |
2883 | 2890 |
// 承認種別と種別名に色を付ける |
2884 | 2891 |
Color SelColor = ClsExcute.ApprovalTypeColorList[iApprovalCode]; |
2885 | 2892 |
dgv.Rows[CurRowCnt].Cells[(int)PersonAppGridCount.ApprovalName].Style.BackColor = SelColor; |
2886 |
string wrkname = MenuTabName.First(x => x.Value.Equals((int)TabNameEnum.MentenanceMenu)).Key;
|
|
2893 |
string wrkname = MenuTabName.First(x => x.Value.Equals((int)TabNameEnum.PersonApproval)).Key;
|
|
2887 | 2894 |
int Tabcount = MenuTabName[wrkname] - 1; |
2888 | 2895 |
|
2889 |
int ObjCurCount = 0; |
|
2890 | 2896 |
object[] objAuthorizer = null; |
2891 | 2897 |
// データセット |
2892 | 2898 |
for (int i = 0; i < BufferList.Count; i++) |
2893 | 2899 |
{ |
2894 | 2900 |
if (i == 0) objAuthorizer = (object[])BufferList[i]; |
2895 |
if ((ObjCurCount + 1) <= BufferList.Count) objAuthorizer = (object[])BufferList[ObjCurCount++];
|
|
2901 |
objAuthorizer = (object[])BufferList[i];
|
|
2896 | 2902 |
|
2897 |
// 承認機能番号・受付番号・工事番号が違えばブレイク |
|
2898 |
if ((iApprovalCode == CommonMotions.cnvInt(objAuthorizer[(int)PersonAppDataList.ApprovalCode])) |
|
2899 |
&& (iOrderNo == CommonMotions.cnvInt(objAuthorizer[(int)PersonAppDataList.OrderNo])) |
|
2900 |
&& (iPersonCode == CommonMotions.cnvInt(objAuthorizer[(int)PersonAppDataList.PersonCode]))) |
|
2901 |
{ |
|
2902 |
|
|
2903 |
} |
|
2904 |
else |
|
2905 |
{ |
|
2906 |
--ObjCurCount; |
|
2907 |
break; |
|
2908 |
} |
|
2909 |
|
|
2910 | 2903 |
iApprovalCode = CommonMotions.cnvInt(objAuthorizer[(int)PersonAppDataList.ApprovalCode]); // 承認機能番号 |
2911 | 2904 |
iOrderNo = CommonMotions.cnvInt(objAuthorizer[(int)PersonAppDataList.OrderNo]); // 受付番号 |
2912 | 2905 |
iPersonCode = CommonMotions.cnvInt(objAuthorizer[(int)PersonAppDataList.PersonCode]); // 担当者番号 |
... | ... | |
2922 | 2915 |
// 列の幅 |
2923 | 2916 |
NewColumn.Width = dgv.Columns[((int)PersonAppGridCount.ApprovalPerson1)].Width; |
2924 | 2917 |
int AllCellColumns = m_CellSize.GetLength(1); |
2925 |
int CurCellBaseCnt = (int)PersonAppGridCount.ApprovalPerson1; |
|
2926 |
if (AllCellColumns > i) m_CellSize[Tabcount, CurCellBaseCnt + i] = dgv.Columns[((int)PersonAppGridCount.ApprovalPerson1)].Width; |
|
2918 |
m_CellSize[Tabcount, (int)PersonAppGridCount.ApprovalPerson1 + i] = dgv.Columns[((int)PersonAppGridCount.ApprovalPerson1)].Width; |
|
2927 | 2919 |
// 列のアライメントセット |
2928 | 2920 |
NewColumn.DefaultCellStyle = dgv.Columns[((int)PersonAppGridCount.ApprovalPerson1)].DefaultCellStyle; |
2929 | 2921 |
|
branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs | ||
---|---|---|
32 | 32 |
// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を |
33 | 33 |
// 既定値にすることができます: |
34 | 34 |
// [assembly: AssemblyVersion("1.0.*")] |
35 |
[assembly: AssemblyVersion("1.0.0.40")]
|
|
36 |
[assembly: AssemblyFileVersion("1.0.0.40")]
|
|
35 |
[assembly: AssemblyVersion("1.0.0.41")]
|
|
36 |
[assembly: AssemblyFileVersion("1.0.0.41")]
|
|
37 | 37 |
// Log4netを使用する |
38 | 38 |
[assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)] |
他の形式にエクスポート: Unified diff