프로젝트

일반

사용자정보

개정판 cb806a91

IDcb806a91deb23eb53fcc4fb79a053d8ac8cfad7e
상위 0caa0b73
하위 50b63148

semi 이(가) 4년 이상 전에 추가함

AliveGrid count expander열림, dashboard 테두리

Change-Id: Id50a07c853f65d7037685ba4c220cdd739c10fca

차이점 보기:

ConvertService/ServiceBase/Markus.Service.StationController/ViewModel/DataBaseItemsModel.cs
22 22
using System.Windows.Controls;
23 23
using System.IO;
24 24
using Newtonsoft.Json;
25
//using Markus.Service.Interface;
26 25
using static Markus.Service.StationController.Data.ConvertPDF;
27 26
using System.Collections.ObjectModel;
28 27

  
......
565 564
            }
566 565
        }
567 566

  
567
        public bool _AliveShow;
568
        public bool AliveShow
569
        {
570
            get => _AliveShow;
571
            set
572
            {
573
                if (_AliveShow = !value)
574
                {
575
                    _AliveShow = false;
576
                }
577
                _AliveShow = value;
578
                OnPropertyChanged(() => AliveShow);
579
            }
580
        }
581

  
568 582
        #endregion
569 583

  
570 584
        #region Command
......
641 655
            }
642 656

  
643 657
            await Task.Delay(5000);
644
            //await Task.Delay(10000);
645 658

  
646 659
            System.Threading.Thread.Sleep(new TimeSpan(0, 0, 0, 0, 100));
647 660

  
......
770 783
                {
771 784
                    if (statusCodeTypeList.Count() == 1)
772 785
                    {
773
                        //Listitems.ForEach(x => collection.Add(x));
774 786
                        foreach (var Listitem in Listitems.ToList())
775 787
                        {
776 788
                            collection.Add(Listitem);
......
829 841
            catch (Exception ex)
830 842
            {
831 843
                MessageBox.Show(ex.ToString());
832
                //System.Diagnostics.Debug.WriteLine(ex.ToString());
833 844
            }
834 845
        }
835 846

  
......
842 853
                {
843 854
                    _status = (int)SelectedStatus.Value;
844 855
                }
845

  
846
                //DocumentID = unikey
847 856
                DateTime? Start_CreateTime = null;
848 857
                DateTime? Finish_CreateTime = null;
849 858
                if (SelectedCreateTimeBegin != DefaultCreateTime)
......
882 891
                }
883 892
                else
884 893
                {
885

  
886
                    ////세미 업데이트
887 894
                    foreach (var newitem in Listitems)
888 895
                    {
889 896
                        collection.UpdateWhere(changeitem =>
......
893 900

  
894 901
                    if (statusCodeTypeList.Count() == 1)
895 902
                    {
896

  
897
                        //삭제
898 903
                        for (int i = collection.Count() - 1; i >= 0; --i)
899 904
                        {
900 905
                            var item = collection[i];
......
908 913

  
909 914
                    if (statusCodeTypeList.Count() == 1)
910 915
                    {
911
                        //추가 convert 후 추가됨
912 916
                        foreach (var item in Listitems)
913 917
                        {
914 918
                            if (collection.Count(x => x.ConvertID == item.ConvertID && x.ProjectNumber == item.ProjectNumber) == 0)
......
937 941
            catch (Exception ex)
938 942
            {
939 943
                MessageBox.Show(ex.ToString());
940
                //System.Diagnostics.Debug.WriteLine(ex.ToString());
941 944
            }
942 945
        }
943 946
        /// <summary>
......
987 990
                                itemsToEach.OriginfilePath = item.OriginfilePath;
988 991
                                itemsToEach.ConvertPath = item.ConvertPath;
989 992
                                itemsToEach.MarkusLink = MarkusLink;
990
                                itemsToEach.UniqueKey = item.UniqueKey;//DocumentNO 없음
991
                                itemsToEach.GroupNo = item.GroupNo;//없음 
992
                                //itemsToEach.ProcessorAffinity = item.ProcessorAffinity;
993
                                itemsToEach.UniqueKey = item.UniqueKey;
994
                                itemsToEach.GroupNo = item.GroupNo;
993 995
                                itemsToEach.DocumentName = item.DocumnetName;
994
                                itemsToEach.Revision = item.Revision; //없음 
995
                                itemsToEach.Exception = item.Exception;//없음
996
                                itemsToEach.Revision = item.Revision; 
997
                                itemsToEach.Exception = item.Exception;
996 998
                                itemsToEach.ConvertPath = item.ConvertPath;
997 999
                                itemsToEach.CreateTime = item.CreateTime;
998 1000
                                itemsToEach.ReConverter = item.ReConverter;
......
1053 1055
            }
1054 1056
            else
1055 1057
            {
1056
                /// 데이터 업데이트
1057 1058
                newitems.ForEach(newitem =>
1058 1059
                {
1059 1060
                    AliveItems.UpdateWhere(changeitem => ConvertItemEx.ChangeValues(changeitem, newitem), x => x.ProjectNumber == newitem.ProjectNumber && x.ConvertID == newitem.ConvertID);
1060 1061
                });
1061 1062

  
1062
                // 추가
1063 1063
                foreach (var item in newitems)
1064 1064
                {
1065 1065
                    if (AliveItems.Count(x => x.ConvertID == item.ConvertID && x.ProjectNumber == item.ProjectNumber) == 0)
......
1068 1068
                    }
1069 1069
                }
1070 1070

  
1071
                /// 삭제
1072

  
1073 1071
                for (int i = AliveItems.Count() - 1; i > -1; --i)
1074 1072
                {
1075 1073
                    var item = AliveItems[i];
......
1087 1085
                    }
1088 1086
                }
1089 1087
            }
1088

  
1089
            if (AliveItems.Count() > 1)
1090
            {
1091
                AliveShow = true;
1092
            }
1090 1093
        }
1091 1094

  
1092 1095

  
......
1137 1140
            {
1138 1141
                if (SelectRealConvert != null)
1139 1142
                {
1140
                    SetCleanUpItem(SelectRealConvert);//ConvertDataBase
1143
                    SetCleanUpItem(SelectRealConvert);
1141 1144
                }
1142 1145
                if (SelectFilterConvertList != null)
1143 1146
                {
......
1182 1185
                var _CREATE_DATETIME = DateTime.Now;
1183 1186
                var _STATUS = (int)StatusCodeType.None;
1184 1187

  
1185
                await WcfClient.GET_SELECT_RERECONVERT_ITEMAsync(_ConvertItem.ConvertID, _RECONVERTER, _CREATE_DATETIME, _STATUS, null);//_END_DATETIME = null 에러
1188
                await WcfClient.GET_SELECT_RERECONVERT_ITEMAsync(_ConvertItem.ConvertID, _RECONVERTER, _CREATE_DATETIME, _STATUS, null);
1186 1189
            }
1187 1190
        }
1188 1191

  
......
1262 1265
        {
1263 1266
            dispatcherTimer.Tick -= new EventHandler(Timer_Tick);
1264 1267
            dispatcherTimer.Tick += new EventHandler(SearchTimer_Tick);
1265
            //DataSearch(new[] { (StatusCodeType)(SelectedStatus.Value) }, FilterConvertSource);
1266 1268
        }
1267 1269

  
1268 1270
        #endregion

내보내기 Unified diff

클립보드 이미지 추가 (최대 크기: 500 MB)