From a6e1ebfc553b662d509688b4b031c67f5b89286d Mon Sep 17 00:00:00 2001 From: sj84 Date: Tue, 12 Sep 2023 14:22:29 +0900 Subject: [PATCH] =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EB=B0=B1?= =?UTF-8?q?=EC=97=85=20.csv=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- INT69DC_7C/Forms/FormDataBackup_Part11.cs | 31 +++++++++++++++----- INT69DC_7C/Forms/FormMain.cs | 35 ----------------------- 2 files changed, 24 insertions(+), 42 deletions(-) diff --git a/INT69DC_7C/Forms/FormDataBackup_Part11.cs b/INT69DC_7C/Forms/FormDataBackup_Part11.cs index 4fb366a..632ee1e 100644 --- a/INT69DC_7C/Forms/FormDataBackup_Part11.cs +++ b/INT69DC_7C/Forms/FormDataBackup_Part11.cs @@ -390,6 +390,8 @@ namespace INT69DC_7C.Forms msg.ShowDialog(); return; } + + this.UpdateDisplayOtherFile(); } private void SplashStart() @@ -433,10 +435,14 @@ namespace INT69DC_7C.Forms { List listFile = new List(); Dictionary dirNames = new Dictionary(); + string[] fileName; #region File List 품번 순서데로 정렬 foreach (FileInfo file in files) - dirNames.Add(file.Name, int.Parse(file.Name.Substring(10, 1))); + { + fileName = file.Name.Split('_'); + dirNames.Add(file.Name, int.Parse(fileName[1].Substring(0, fileName[1].Length - 4))); + } var vrList = dirNames.OrderBy(x => x.Value); foreach (var v in vrList) @@ -502,7 +508,7 @@ namespace INT69DC_7C.Forms if (tree.Nodes[i].Nodes[j].Nodes[k].Checked == true) { //listSelectedFile.Add(tree.Nodes[i].Nodes[j].Nodes[k].Text); - listSelectedFile.Add(string.Format("{0}\\{1}\\{2}", tree.Nodes[i].Text, tree.Nodes[i].Nodes[j].Text, tree.Nodes[i].Nodes[j].Nodes[k].Text)); + listSelectedFile.Add(string.Format("{0}\\{1}\\{2}.csv", tree.Nodes[i].Text, tree.Nodes[i].Nodes[j].Text, tree.Nodes[i].Nodes[j].Nodes[k].Text)); } } } @@ -517,7 +523,7 @@ namespace INT69DC_7C.Forms private void UpdateDisplayInspectionFile() { int fileCount = 0; - //TreeNode node; + string[] fileName; List years = new List(); List months = new List(); List days = new List(); @@ -583,7 +589,8 @@ namespace INT69DC_7C.Forms for (int k = 0; k < this.ListInspectionFile[i].Months[j].Days.Count; k++) { - nodeMonth.Nodes.Add(this.ListInspectionFile[i].Months[j].Days[k]); + fileName = this.ListInspectionFile[i].Months[j].Days[k].Split('.'); + nodeMonth.Nodes.Add(fileName[0]); fileCount++; } node.Nodes.Add(nodeMonth); @@ -597,7 +604,7 @@ namespace INT69DC_7C.Forms private void UpdateDisplayHistoryFile() { int fileCount = 0; - //TreeNode node; + string[] fileName; List years = new List(); List months = new List(); List days = new List(); @@ -663,7 +670,8 @@ namespace INT69DC_7C.Forms for (int k = 0; k < this.ListHistoryFile[i].Months[j].Days.Count; k++) { - nodeMonth.Nodes.Add(this.ListHistoryFile[i].Months[j].Days[k]); + fileName = this.ListHistoryFile[i].Months[j].Days[k].Split('.'); + nodeMonth.Nodes.Add(fileName[0]); fileCount++; } node.Nodes.Add(nodeMonth); @@ -676,6 +684,7 @@ namespace INT69DC_7C.Forms private void UpdateDisplayOtherFile() { bool directoryCheck = false; + string[] fileName; this.ParentForm.SystemConfig.CurrentForm = DataStore.FormStore.FormDataBackup; @@ -691,7 +700,15 @@ namespace INT69DC_7C.Forms this.listBoxOther.Items.Clear(); foreach (FileInfo file in files) - this.listBoxOther.Items.Add(file.Name); + { + if (file.Name.Substring(0, 1) == "S") + { + fileName = file.Name.Split('.'); + this.listBoxOther.Items.Add(fileName[0]); + } + else + this.listBoxOther.Items.Add(file.Name); + } this.labelOtherFileCount.Text = this.listBoxOther.Items.Count.ToString(); } diff --git a/INT69DC_7C/Forms/FormMain.cs b/INT69DC_7C/Forms/FormMain.cs index bff250c..54bcadb 100644 --- a/INT69DC_7C/Forms/FormMain.cs +++ b/INT69DC_7C/Forms/FormMain.cs @@ -11167,41 +11167,6 @@ namespace INT69DC_7C.Forms #endregion #region Backup - public List GetSeletedNodeList(TreeView tree) - { - int yearCNT, monthCNT, dayCNT; - List listSelectedFile = new List(); - - yearCNT = tree.Nodes.Count; - if (yearCNT != 0) - { - for (int i = 0; i < yearCNT; i++) - { - monthCNT = tree.Nodes[i].Nodes.Count; - if (monthCNT != 0) - { - for (int j = 0; j < monthCNT; j++) - { - dayCNT = tree.Nodes[i].Nodes[j].Nodes.Count; - if (dayCNT != 0) - { - for (int k = 0; k < dayCNT; k++) - { - //if (tree.Nodes[i].Nodes[j].Nodes[k].Checked == true) - //{ - //listSelectedFile.Add(tree.Nodes[i].Nodes[j].Nodes[k].Text); - listSelectedFile.Add(string.Format("{0}\\{1}\\{2}", tree.Nodes[i].Text, tree.Nodes[i].Nodes[j].Text, tree.Nodes[i].Nodes[j].Nodes[k].Text)); - //} - } - } - } - } - } - } - - return listSelectedFile; - } - private void DeleteLogFile(string path, DataStore.E_DataType type) { string dataFolderPath = "";