This commit is contained in:
@@ -47,13 +47,17 @@ namespace rmutr_report.Controllers
|
|||||||
{
|
{
|
||||||
faculty.total_budget = faculty.unit_price;
|
faculty.total_budget = faculty.unit_price;
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach (var assetList in faculty.asset_lists)
|
foreach (var assetList in faculty.asset_lists)
|
||||||
{
|
{
|
||||||
if (assetList.total<=10)
|
if (assetList.total<=10)
|
||||||
{
|
{
|
||||||
assetList.total = assetList.unit_price;
|
assetList.total = assetList.unit_price;
|
||||||
}
|
}
|
||||||
|
if (assetList.total==null&&assetList.amount==1)
|
||||||
|
{
|
||||||
|
assetList.total = assetList.unit_price;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
@@ -13,7 +13,7 @@ using System.Reflection;
|
|||||||
[assembly: System.Reflection.AssemblyCompanyAttribute("rmutr_report")]
|
[assembly: System.Reflection.AssemblyCompanyAttribute("rmutr_report")]
|
||||||
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
|
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
|
||||||
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
|
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
|
||||||
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d3ca59bb6898d7aaa0d4ed57404d662f17ad737d")]
|
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+ad0b43ca48bec5b06b9d28038409fb43c50ccec5")]
|
||||||
[assembly: System.Reflection.AssemblyProductAttribute("rmutr_report")]
|
[assembly: System.Reflection.AssemblyProductAttribute("rmutr_report")]
|
||||||
[assembly: System.Reflection.AssemblyTitleAttribute("rmutr_report")]
|
[assembly: System.Reflection.AssemblyTitleAttribute("rmutr_report")]
|
||||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
|
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
578315dfe7acff9d1520dc6815c4da6525e5f7c5be5bd108ef249e8702bd9738
|
dc5eabf09b58379b53feb30709b996c5032760611cba7922a37905f04ffadfb5
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ using System.Reflection;
|
|||||||
[assembly: System.Reflection.AssemblyCompanyAttribute("rmutr_report")]
|
[assembly: System.Reflection.AssemblyCompanyAttribute("rmutr_report")]
|
||||||
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
|
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
|
||||||
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
|
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
|
||||||
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d3ca59bb6898d7aaa0d4ed57404d662f17ad737d")]
|
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+ad0b43ca48bec5b06b9d28038409fb43c50ccec5")]
|
||||||
[assembly: System.Reflection.AssemblyProductAttribute("rmutr_report")]
|
[assembly: System.Reflection.AssemblyProductAttribute("rmutr_report")]
|
||||||
[assembly: System.Reflection.AssemblyTitleAttribute("rmutr_report")]
|
[assembly: System.Reflection.AssemblyTitleAttribute("rmutr_report")]
|
||||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
|
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
578315dfe7acff9d1520dc6815c4da6525e5f7c5be5bd108ef249e8702bd9738
|
dc5eabf09b58379b53feb30709b996c5032760611cba7922a37905f04ffadfb5
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
a84ad6cbd8971193dca07004150b8d3755a741cd25dfeef71b03c7aee56b117c
|
68de01a6bd7215a94454eb302693f9228d732e4e8151a0ca1a8cd5a493df713b
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
@@ -1 +1 @@
|
|||||||
17266438397777143
|
17266565040277969
|
||||||
@@ -1 +1 @@
|
|||||||
17266565040277969
|
17267261645160802
|
||||||
Reference in New Issue
Block a user