Visitor.cs Changes

CRM.Visitors/Infos/Visitor.cs

@@ -14,13 +14,11 @@ namespace Bizgaze.CRM.Visitors.Infos
     {
         public enum Property
         {
-            VisitorId, StageId, TenantId, StatusId, PurposeOfVisit, Title, SeriesId, Code, Reason, EmailId, ComingFrom, VersionguId, MobileNumber, FullName, NewCheckIn, PreInvite, AccessCode, FutureInvitation, TimeOfVisit, DateOfVisit, HostName, OrganizationName, TitleName, VisitorType, TemplateId, Installedappid, PhotoUrl, CreatedDate, StageStatusName, RefStatusId, AlternateNumber, ImageUrl, VisitorNumberId, VisitorEmailId, Agreement, LastUpdatedDate,TypeofVisitor,CityId,CityName
+            VisitorId, StageId, TenantId, StatusId, PurposeOfVisit, Title, SeriesId, Code, Reason, EmailId, VersionguId, MobileNumber, FullName, NewCheckIn, PreInvite, AccessCode, FutureInvitation, TimeOfVisit, DateOfVisit, HostName, OrganizationName, TitleName, VisitorType, TemplateId, Installedappid, PhotoUrl, CreatedDate, StageStatusName, RefStatusId, AlternateNumber, ImageUrl, VisitorNumberId, VisitorEmailId, Agreement, LastUpdatedDate, TypeofVisitor, CityName, CityId, CheckInDate
 
         }
         #region Public Properties
         public Int64 VisitorId { get; set; }
-        public Int64 CityId { get; set; }
-        public string CityName { get; set; }
         public Int64 VisitorEmailId { get; set; }
         public Int64 VisitorNumberId { get; set; }
         public Int64 AlternateNumber { get; set; }
@@ -55,6 +53,8 @@ namespace Bizgaze.CRM.Visitors.Infos
         public string PhotoUrl { get; set; }
         public string ImageUrl { get; set; }
         public DateTime LastUpdatedDate { get; set; }
+        public string CityName { get; set; }
+        public Int64 CityId { get; set; }
         #endregion
         public string __TableName
         {
@@ -76,7 +76,6 @@ namespace Bizgaze.CRM.Visitors.Infos
 
             string[] columns = {
                 "v.cityid",
-                "ci.cityname",
                 "vn.mobilenumber",
                 "v.alternatenumber",
                 "v.employeeid",
@@ -105,16 +104,16 @@ namespace Bizgaze.CRM.Visitors.Infos
                  "v.tenantid",
                  "v.visitortype",
                  "v.seriesid",
-                 "v.agreement",                
+                 "v.agreement",
                  "v.lastupdateddate",
-                 "v.versionguid",
+                 "v.versionguid","ci.cityname",
                  "(select imageurl from bizgazecrm_companies where companyid="+CompanyId+") as imageurl",
             "Case when purposeofvisit=1 then 'Interview'  when purposeofvisit=2 then 'Official Meeting'  when purposeofvisit=3 then 'Meeting an Employee'  when purposeofvisit=4 then 'Package Delivery' when purposeofvisit=5 then 'Others' end as purposeofvisittype",
                 "concat(e.firstname, e.lastname) AS HostName",
                 "Case when title=1 then 'Mr'  when title=2  then 'Miss' end as TitleName",
                 };
             return new Select("bizgazecrm_visitors v").Columns(columns).
-                InnerJoin("bizgazecrm_employees e", Exp.EqColumns("e.employeeid", "v.employeeid")).InnerJoin("unibase_stages s", Exp.EqColumns("v.stageid", "s.stageid")).InnerJoin("unibase_stagestatus ss", Exp.EqColumns("ss.stagestatusid", "s.stagestatusid")).InnerJoin("bizgazecrm_visitornumbers vn", Exp.EqColumns("vn.visitorid", "v.visitorid")).InnerJoin("bizgazecrm_visitoremails ve", Exp.EqColumns("ve.visitorid", "v.visitorid")).InnerJoin("bizgazecrm_cities ci",Exp.EqColumns("v.cityid","ci.cityid"));
+                InnerJoin("bizgazecrm_employees e", Exp.EqColumns("e.employeeid", "v.employeeid")).InnerJoin("unibase_stages s", Exp.EqColumns("v.stageid", "s.stageid")).InnerJoin("unibase_stagestatus ss", Exp.EqColumns("ss.stagestatusid", "s.stagestatusid")).InnerJoin("bizgazecrm_visitornumbers vn", Exp.EqColumns("vn.visitorid", "v.visitorid")).InnerJoin("bizgazecrm_visitoremails ve", Exp.EqColumns("ve.visitorid", "v.visitorid")).InnerJoin("bizgazecrm_cities ci ", Exp.EqColumns("v.cityid", "ci.cityid"));
 
         }
     }