Compare commits
No commits in common. "master" and "refactor_code3" have entirely different histories.
master
...
refactor_c
@ -452,36 +452,34 @@ namespace SafeMobileLib
|
||||
|
||||
BatchHistoryData batchHistObj = null;
|
||||
|
||||
|
||||
|
||||
try
|
||||
{
|
||||
|
||||
|
||||
|
||||
lat = Convert.ToDouble(dr["lat"]);
|
||||
lng = Convert.ToDouble(dr["lng"]);
|
||||
timegmt = Convert.ToInt32(dr["timegmt"]);
|
||||
|
||||
batchHistObj = new BatchHistoryData
|
||||
{
|
||||
batchHistObj = new BatchHistoryData
|
||||
{
|
||||
|
||||
Department = dr["department"].ToString(),
|
||||
Unit = dr["unit"].ToString(),
|
||||
Location = ((getAddress && dr["address"] != DBNull.Value) ? dr["address"].ToString() : "LAT:" + Math.Round(lat, 5).ToString() + " , LNG:" + Math.Round(lat, 5).ToString()),
|
||||
Speed = (isInMile) ? ((int)(Convert.ToInt32(dr["speed"]) * 0.621371192)).ToString() : Convert.ToInt32(dr["speed"]).ToString(),
|
||||
Lat = lat,
|
||||
Lng = lng,
|
||||
Address = string.Empty,
|
||||
Address = dr["address"].ToString(),
|
||||
Time = timegmt.TimeOfDayHHMMSSLocal(!is24hours),
|
||||
Date = timegmt.GetDTLocalFromSeconds().Date.ToShortDateString()
|
||||
|
||||
};
|
||||
|
||||
if (getAddress)
|
||||
{
|
||||
batchHistObj.Location = dr["address"].ToString();
|
||||
batchHistObj.Address = dr["address"].ToString();
|
||||
}
|
||||
else
|
||||
batchHistObj.Location = "LAT:" + Math.Round(lat, 5).ToString() + " , LNG:" + Math.Round(lat, 5).ToString();
|
||||
|
||||
|
||||
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
@ -112,9 +112,7 @@
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="prebuild.sh" />
|
||||
<None Include="RunMessagesPartitioning.bat">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="RunMessagesPartitioning.bat" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<BootstrapperPackage Include=".NETFramework,Version=v4.5">
|
||||
@ -146,9 +144,7 @@
|
||||
<Content Include="7toLatest7.sql">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="call_messages_partitioning.sql">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="call_messages_partitioning.sql" />
|
||||
<Content Include="CreateMissingForeignKeys.sql">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
@ -158,12 +154,8 @@
|
||||
<Content Include="CreateMissingPrimaryKeys.sql">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="generate_partitioning_of_an_existing_table_by_date_unix_time.sql">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="get_query_partitioning_of_an_existing_table_by_date_unix_time.sql">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="generate_partitioning_of_an_existing_table_by_date_unix_time.sql" />
|
||||
<Content Include="get_query_partitioning_of_an_existing_table_by_date_unix_time.sql" />
|
||||
<Content Include="NewFields.sql">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
|
Loading…
Reference in New Issue
Block a user