Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Browse Source
This commit is contained in:
Kathy Ruffing 2012-10-26 10:13:05 +00:00
parent 94d2b11dc3
commit 75ee5c4141
3 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
PROMS/DataLoader/Approve.cs
View File

@ -364,12 +364,6 @@ namespace DataLoader
get { return _RevDate; } get { return _RevDate; }
set { _RevDate = value; } set { _RevDate = value; }
} }
private string _ReviewDate;
public string ReviewDate
{
get { return _ReviewDate; }
set { _ReviewDate = value; }
}
public ProcInfo(DataRow dr, string afpath) public ProcInfo(DataRow dr, string afpath)
{ {
Number = dr["NUMBER"].ToString(); Number = dr["NUMBER"].ToString();
@ -388,8 +382,9 @@ namespace DataLoader
if (fis.Count > 0) if (fis.Count > 0)
{ {
Rev = fis[0].Rev; Rev = fis[0].Rev;
RevDate = fis[0].RevDate ?? GetDBFRevDate(afpath); // the following line needs fixed, i.e. should the date come from the set file or
ReviewDate = fis[0].ReviewDate; // the datetime stamp of dbf (GetDBFRevDate):
//RevDate = fis[0].RevDate ?? GetDBFRevDate(afpath);
} }
} }
public System.DateTime GetDTS(string date, string time) public System.DateTime GetDTS(string date, string time)

17
PROMS/DataLoader/FixItem.cs
View File

@ -35,11 +35,8 @@ namespace DataLoader
if (str.Contains(" ")) if (str.Contains(" "))
{ {
int index = str.IndexOf(" "); int index = str.IndexOf(" ");
string [] parts = str.Substring(index + 1).Split("\\".ToCharArray());
_Sequence = str.Substring(0, index); _Sequence = str.Substring(0, index);
if (parts.Length > 0) _Rev = parts[0]; _Rev = str.Substring(index + 1);
if (parts.Length > 1) _RevDate = parts[1];
if (parts.Length > 2) _ReviewDate = parts[2];
} }
else else
_Sequence = str; _Sequence = str;
@ -68,17 +65,5 @@ namespace DataLoader
get { return _Rev; } get { return _Rev; }
set { _Rev = value; } set { _Rev = value; }
} }
private string _RevDate;
public string RevDate
{
get { return _RevDate; }
set { _RevDate = value; }
}
private string _ReviewDate;
public string ReviewDate
{
get { return _ReviewDate; }
set { _ReviewDate = value; }
}
} }
} }

2
PROMS/DataLoader/Procedures.cs
View File

@ -74,8 +74,6 @@ namespace DataLoader
{ {
if (ci == null) ci = new ConfigInfo(null); if (ci == null) ci = new ConfigInfo(null);
if (fixItems[0].Rev != null && fixItems[0].Rev != "") ci.AddItem("Procedure", "Rev", fixItems[0].Rev); if (fixItems[0].Rev != null && fixItems[0].Rev != "") ci.AddItem("Procedure", "Rev", fixItems[0].Rev);
if (fixItems[0].RevDate != null && fixItems[0].RevDate != "") ci.AddItem("Procedure", "RevDate", fixItems[0].RevDate);
if (fixItems[0].ReviewDate != null && fixItems[0].ReviewDate != "") ci.AddItem("Procedure", "ReviewDate", fixItems[0].ReviewDate);
} }
} }
// check that there is a "Series" column, i.e. the 10th column, some datasets // check that there is a "Series" column, i.e. the 10th column, some datasets