개정판 4fcb686a
issue #000 font가 적용 되지 않아 box size가 작게 출력되는 문제
Change-Id: Ie07531db96d56e8d5c2bbdbf0786d053ad39747c
| KCOM_API/ServiceDeepView.svc.cs | ||
|---|---|---|
| 773 | 773 |
|
| 774 | 774 |
} |
| 775 | 775 |
|
| 776 |
if (_ColorsProperties.Count() == 0)
|
|
| 776 |
if (_ColorsProperties.Count() != _result.GroupBy(x=>x.UserID).Count())
|
|
| 777 | 777 |
{
|
| 778 | 778 |
ColorGenerator uniqueColorGenerator = new ColorGenerator(System.Drawing.Color.Red); // 2303 = (int)Color.Red |
| 779 | 779 |
|
| ... | ... | |
| 788 | 788 |
|
| 789 | 789 |
bool IsProjectNoPass = Properties.Settings.Default.IsProjectNoPass; |
| 790 | 790 |
|
| 791 |
foreach (var item in _result) |
|
| 791 |
foreach (var item in _result.GroupBy(x=>x.UserID))
|
|
| 792 | 792 |
{
|
| 793 | 793 |
string query = "SELECT members.ID,members.NAME,members.DEPARTMENT FROM CIEntities.MEMBER as members where members.ID = @userId"; |
| 794 | 794 |
|
| 795 | 795 |
System.Data.Objects.ObjectQuery<System.Data.Common.DbDataRecord> memberQuery |
| 796 |
= entity.CreateQuery<System.Data.Common.DbDataRecord>(query,new System.Data.Objects.ObjectParameter("userId",item.UserID));
|
|
| 797 |
|
|
| 796 |
= entity.CreateQuery<System.Data.Common.DbDataRecord>(query,new System.Data.Objects.ObjectParameter("userId",item.Key));
|
|
| 797 |
|
|
| 798 | 798 |
if (memberQuery.Count() > 0) |
| 799 | 799 |
{
|
| 800 | 800 |
string userName = memberQuery.First()["NAME"]?.ToString().Trim(); |
| 801 | 801 |
string depatment = memberQuery.First()["DEPARTMENT"]?.ToString().Trim(); |
| 802 | 802 |
|
| 803 |
item.UserName = userName; |
|
| 804 |
item.Depatment = depatment; |
|
| 805 |
} |
|
| 806 |
|
|
| 807 |
if (_ColorsProperties.Count > 0) |
|
| 808 |
{
|
|
| 809 |
int colorIdx = random.Next(0, _ColorsProperties.Count() - 1); |
|
| 810 |
#region 부서별로 색상을 지정하고자 할때 |
|
| 811 |
/// 일단 의견을 들어보자구! |
|
| 812 |
#endregion |
|
| 813 |
item.DisplayColor = "#FF" + _ColorsProperties[colorIdx].VALUE; |
|
| 814 |
_ColorsProperties.Remove(_ColorsProperties[colorIdx]); |
|
| 815 |
} |
|
| 816 |
else |
|
| 817 |
{
|
|
| 818 |
item.DisplayColor = String.Format("#FF{0:X6}", random.Next(0x1000000));
|
|
| 803 |
PROPERTIES deptColor = _ColorsProperties[0]; |
|
| 804 |
|
|
| 805 |
_ColorsProperties.RemoveAt(0); |
|
| 806 |
//PROPERTIES deptColor = _ColorsProperties.Find(c => c.PROPERTY == depatment); |
|
| 807 |
|
|
| 808 |
//if (_ColorsProperties.Count > 0) |
|
| 809 |
//{
|
|
| 810 |
// if (deptColor == null) |
|
| 811 |
// {
|
|
| 812 |
// item.DisplayColor = "#FF" + _ColorsProperties[0].VALUE; |
|
| 813 |
// _ColorsProperties.RemoveAt(0); |
|
| 814 |
// } |
|
| 815 |
// else |
|
| 816 |
// {
|
|
| 817 |
// item.DisplayColor = "#FF" + deptColor.VALUE; |
|
| 818 |
// _ColorsProperties.Remove(deptColor); |
|
| 819 |
// } |
|
| 820 |
//} |
|
| 821 |
|
|
| 822 |
foreach (var markupInfo in item) |
|
| 823 |
{
|
|
| 824 |
markupInfo.DisplayColor = "#FF" + deptColor.VALUE; |
|
| 825 |
markupInfo.UserName = userName; |
|
| 826 |
markupInfo.Depatment = depatment; |
|
| 827 |
} |
|
| 819 | 828 |
} |
| 820 | 829 |
} |
| 830 |
|
|
| 831 |
|
|
| 832 |
//else |
|
| 833 |
//{
|
|
| 834 |
// item.DisplayColor = String.Format("#FF{0:X6}", random.Next(0x1000000));
|
|
| 835 |
//} |
|
| 821 | 836 |
} |
| 822 | 837 |
} |
| 823 | 838 |
catch (Exception ex) |
내보내기 Unified diff
