リビジョン 246
購入品及び交通費入力対象年月選択バグ修正
| branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs | ||
|---|---|---|
| 14 | 14 |
/// <summary> |
| 15 | 15 |
/// 本体バージョン |
| 16 | 16 |
/// </summary> |
| 17 |
public static int s_SystemVersion = 60;
|
|
| 17 |
public static int s_SystemVersion = 61;
|
|
| 18 | 18 |
|
| 19 | 19 |
/// <summary> |
| 20 | 20 |
/// コピー・環境バージョン |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/TAndPCosts/FrmTAndPCostsAuxiliary.cs | ||
|---|---|---|
| 164 | 164 |
IOCostDataOfPerson CostDB = new IOCostDataOfPerson(); |
| 165 | 165 |
try |
| 166 | 166 |
{
|
| 167 |
List<KeyValuePair<string, string>> DataList = new List<KeyValuePair<string, string>>(); |
|
| 168 |
// 来月の追加判定(25日過ぎは来月の追加をする) |
|
| 169 |
if (DateTime.Now.Day > 25) |
|
| 170 |
{
|
|
| 171 |
DateTime dtNext = DateTime.Now.AddMonths(1); |
|
| 172 |
string NextMonth = string.Format("{0}/{1}", dtNext.Year, dtNext.Month.ToString("00"));
|
|
| 173 |
KeyValuePair<string, string> keyval = new KeyValuePair<string, string>(NextMonth, (NextMonth.ToString().Replace("/", "年") + "月"));
|
|
| 174 |
DataList.Add(keyval); |
|
| 175 |
} |
|
| 176 |
|
|
| 167 | 177 |
// 存在月を担当者毎経費データより取得する |
| 168 | 178 |
string strSQL = "SELECT DATE_FORMAT(ACTIONDATE,'%Y/%m'), COUNT(*) FROM CostDataOfPerson GROUP BY DATE_FORMAT(ACTIONDATE,'%Y/%m') ORDER BY 1 DESC"; |
| 169 | 179 |
ArrayList arList = new ArrayList(); |
| 170 | 180 |
CostDB.ExecuteReader(strSQL, ref arList); |
| 171 | 181 |
|
| 172 |
List<KeyValuePair<string, string>> DataList = new List<KeyValuePair<string, string>>(); |
|
| 173 |
foreach (object[] wrkobj in arList) |
|
| 174 |
{
|
|
| 175 |
KeyValuePair<string, string> keyval = new KeyValuePair<string, string>(wrkobj[0].ToString(), (wrkobj[0].ToString().Replace("/", "年") + "月"));
|
|
| 176 |
DataList.Add(keyval); |
|
| 177 |
} |
|
| 178 |
|
|
| 179 | 182 |
// 当月を作成する |
| 180 | 183 |
string ToMonth = string.Format("{0}/{1}", DateTime.Now.Year, DateTime.Now.Month.ToString("00"));
|
| 181 | 184 |
// 当月を追加するかの判断 |
| ... | ... | |
| 184 | 187 |
KeyValuePair<string, string> keyval = new KeyValuePair<string, string>(ToMonth, (ToMonth.ToString().Replace("/", "年") + "月"));
|
| 185 | 188 |
DataList.Add(keyval); |
| 186 | 189 |
} |
| 187 |
// 来月の追加判定(25日過ぎは来月の追加をする) |
|
| 188 |
if (DateTime.Now.Day > 25) |
|
| 190 |
|
|
| 191 |
// 存在月の追加 |
|
| 192 |
string strKeyData = string.Empty; |
|
| 193 |
foreach (object[] wrkobj in arList) |
|
| 189 | 194 |
{
|
| 190 |
DateTime dtNext = DateTime.Now.AddMonths(1); |
|
| 191 |
string NextMonth = string.Format("{0}/{1}", dtNext.Year, dtNext.Month.ToString("00"));
|
|
| 192 |
KeyValuePair<string, string> keyval = new KeyValuePair<string, string>(NextMonth, (NextMonth.ToString().Replace("/", "年") + "月"));
|
|
| 195 |
strKeyData = wrkobj[0].ToString(); |
|
| 196 |
// 最後のキーが取得データの先頭と同じ場合は追加しない |
|
| 197 |
if (strKeyData.Equals(DataList[(DataList.Count - 1)].Key)) continue; |
|
| 198 |
|
|
| 199 |
KeyValuePair<string, string> keyval = new KeyValuePair<string, string>(strKeyData, (wrkobj[0].ToString().Replace("/", "年") + "月"));
|
|
| 193 | 200 |
DataList.Add(keyval); |
| 194 | 201 |
} |
| 195 |
|
|
| 196 |
|
|
| 202 |
|
|
| 197 | 203 |
ComboBoxAction.InitDataSetCombBox(comboBox1, DataList); |
| 198 | 204 |
comboBox1.SelectedValue = ToMonth; |
| 199 | 205 |
} |
| branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs | ||
|---|---|---|
| 32 | 32 |
// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を |
| 33 | 33 |
// 既定値にすることができます: |
| 34 | 34 |
// [assembly: AssemblyVersion("1.0.*")]
|
| 35 |
[assembly: AssemblyVersion("1.0.0.60")]
|
|
| 36 |
[assembly: AssemblyFileVersion("1.0.0.60")]
|
|
| 35 |
[assembly: AssemblyVersion("1.0.0.61")]
|
|
| 36 |
[assembly: AssemblyFileVersion("1.0.0.61")]
|
|
| 37 | 37 |
// Log4netを使用する |
| 38 | 38 |
[assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)] |
他の形式にエクスポート: Unified diff