aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/PPC/Modules
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2019-12-16 10:33:43 +0200
committerRoy Ben-Shabat <Roy@Twine-s.com>2019-12-16 10:33:43 +0200
commite8ee7dfb8e166e34c7950e90d5fe9bcf31dc351b (patch)
tree0b2fd7e8d0c2dc0bc8706c94c4019cd92bd252bc /Software/Visual_Studio/PPC/Modules
parent5ef0db61993e269caa1d1184ee0be2ae1c6ea393 (diff)
downloadTango-e8ee7dfb8e166e34c7950e90d5fe9bcf31dc351b.tar.gz
Tango-e8ee7dfb8e166e34c7950e90d5fe9bcf31dc351b.zip
Some fixes.
Diffstat (limited to 'Software/Visual_Studio/PPC/Modules')
-rw-r--r--Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/sync_job.png (renamed from Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/sync-job.png)bin6743 -> 6743 bytes
-rw-r--r--Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/NotificationItems/NewSynchronizardJobsNotificationItemView.xaml6
-rw-r--r--Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj5
-rw-r--r--Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs1
4 files changed, 10 insertions, 2 deletions
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/sync-job.png b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/sync_job.png
index 4e46ee447..4e46ee447 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/sync-job.png
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/sync_job.png
Binary files differ
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/NotificationItems/NewSynchronizardJobsNotificationItemView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/NotificationItems/NewSynchronizardJobsNotificationItemView.xaml
index 23a64676b..5a57e3db7 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/NotificationItems/NewSynchronizardJobsNotificationItemView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/NotificationItems/NewSynchronizardJobsNotificationItemView.xaml
@@ -10,10 +10,14 @@
x:Name="MessageNotificationItemControl"
d:DesignHeight="60" d:DesignWidth="800" d:DataContext="{d:DesignInstance Type=local:NewSynchronizardJobsNotificationItem, IsDesignTimeCreatable=False}" MinHeight="90" Height="90" MaxHeight="150" Background="White">
+ <UserControl.Resources>
+ <BitmapImage x:Key="icon" UriSource="../Images/sync_job.png" />
+ </UserControl.Resources>
+
<Grid>
<Border BorderThickness="0 0 0 2" BorderBrush="{StaticResource TangoPrimaryAccentBrush}" Padding="15">
<DockPanel>
- <Image Source="../Images/sync-job.png" MaxHeight="50" />
+ <Image Source="{StaticResource icon}" MaxHeight="50" />
<Grid>
<TextBlock Margin="20 0 0 0" VerticalAlignment="Center">
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj
index 5e1fd39bd..33b9de808 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj
@@ -503,10 +503,13 @@
<ItemGroup>
<Resource Include="Images\JobView\transparent_small.jpg" />
</ItemGroup>
+ <ItemGroup>
+ <Resource Include="Images\sync_job.png" />
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ProjectExtensions>
<VisualStudio>
- <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+ <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
</VisualStudio>
</ProjectExtensions>
</Project> \ No newline at end of file
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
index 5ec1c34ec..0175b949e 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
@@ -595,6 +595,7 @@ namespace Tango.PPC.Jobs.ViewModels
Job.LastUpdated = DateTime.UtcNow;
Job.IsSynchronized = false;
Job.JobStatus = BL.Enumerations.JobStatuses.Draft;
+ Job.MarkModified(_db);
await _db.SaveChangesAsync();
_current_job_string = Job.ToJobFileWhenLoaded().ToString();