laurentiu.constantin/SafeDispatch
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: laurentiu.constantin:master
Branches Tags
laurentiu.constantin:master
laurentiu.constantin:add_scripts_for_messages_partitiong
laurentiu.constantin:fix_BatchHistory_report
laurentiu.constantin:refactor_code3
laurentiu.constantin:refactor_code2
laurentiu.constantin:blacklist_popServer
laurentiu.constantin:give_one_more_chance_to_send_email
laurentiu.constantin:refactor_code1
laurentiu.constantin:fix_Take_gateway_from_localhost
laurentiu.constantin:handle_email_address_in_blacklist
laurentiu.constantin:avoid_flooding_logs_if_failed_sending_email
laurentiu.constantin:refactor_code
laurentiu.constantin:change_version_to_8_2_0_10898
laurentiu.constantin:refactor_AppServer_LocationThread
laurentiu.constantin:add_Update_Helper
laurentiu.constantin:Batch_Historical_Group_Report
laurentiu.constantin:8.2.0.10898
laurentiu.constantin:8.1.0.10898
..
compare: laurentiu.constantin:refactor_code3
Branches Tags
laurentiu.constantin:master
laurentiu.constantin:add_scripts_for_messages_partitiong
laurentiu.constantin:fix_BatchHistory_report
laurentiu.constantin:refactor_code3
laurentiu.constantin:refactor_code2
laurentiu.constantin:blacklist_popServer
laurentiu.constantin:give_one_more_chance_to_send_email
laurentiu.constantin:refactor_code1
laurentiu.constantin:fix_Take_gateway_from_localhost
laurentiu.constantin:handle_email_address_in_blacklist
laurentiu.constantin:avoid_flooding_logs_if_failed_sending_email
laurentiu.constantin:refactor_code
laurentiu.constantin:change_version_to_8_2_0_10898
laurentiu.constantin:refactor_AppServer_LocationThread
laurentiu.constantin:add_Update_Helper
laurentiu.constantin:Batch_Historical_Group_Report
laurentiu.constantin:8.2.0.10898
laurentiu.constantin:8.1.0.10898

No commits in common. "master" and "refactor_code3" have entirely different histories.
master ... refactor_c

2 changed files with 13 additions and 23 deletions
Show Stats Expand all files Collapse all files

20
SafeMobileLIB_DLL/DBmanagers/DBReportingManager.cs
View File

@ -452,36 +452,34 @@ namespace SafeMobileLib
BatchHistoryData batchHistObj = null; BatchHistoryData batchHistObj = null;
try try
{ {
lat = Convert.ToDouble(dr["lat"]); lat = Convert.ToDouble(dr["lat"]);
lng = Convert.ToDouble(dr["lng"]); lng = Convert.ToDouble(dr["lng"]);
timegmt = Convert.ToInt32(dr["timegmt"]); timegmt = Convert.ToInt32(dr["timegmt"]);
batchHistObj = new BatchHistoryData batchHistObj = new BatchHistoryData
{ {
Department = dr["department"].ToString(), Department = dr["department"].ToString(),
Unit = dr["unit"].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(), Speed = (isInMile) ? ((int)(Convert.ToInt32(dr["speed"]) * 0.621371192)).ToString() : Convert.ToInt32(dr["speed"]).ToString(),
Lat = lat, Lat = lat,
Lng = lng, Lng = lng,
Address = string.Empty, Address = dr["address"].ToString(),
Time = timegmt.TimeOfDayHHMMSSLocal(!is24hours), Time = timegmt.TimeOfDayHHMMSSLocal(!is24hours),
Date = timegmt.GetDTLocalFromSeconds().Date.ToShortDateString() 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) catch (Exception ex)
{ {

16
UpdateHelper/UpdateHelper.csproj
View File

@ -112,9 +112,7 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>
<None Include="prebuild.sh" /> <None Include="prebuild.sh" />
<None Include="RunMessagesPartitioning.bat"> <None Include="RunMessagesPartitioning.bat" />
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<BootstrapperPackage Include=".NETFramework,Version=v4.5"> <BootstrapperPackage Include=".NETFramework,Version=v4.5">
@ -146,9 +144,7 @@
<Content Include="7toLatest7.sql"> <Content Include="7toLatest7.sql">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content> </Content>
<Content Include="call_messages_partitioning.sql"> <Content Include="call_messages_partitioning.sql" />
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="CreateMissingForeignKeys.sql"> <Content Include="CreateMissingForeignKeys.sql">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content> </Content>
@ -158,12 +154,8 @@
<Content Include="CreateMissingPrimaryKeys.sql"> <Content Include="CreateMissingPrimaryKeys.sql">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content> </Content>
<Content Include="generate_partitioning_of_an_existing_table_by_date_unix_time.sql"> <Content Include="generate_partitioning_of_an_existing_table_by_date_unix_time.sql" />
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <Content Include="get_query_partitioning_of_an_existing_table_by_date_unix_time.sql" />
</Content>
<Content Include="get_query_partitioning_of_an_existing_table_by_date_unix_time.sql">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="NewFields.sql"> <Content Include="NewFields.sql">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content> </Content>