Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS
This commit is contained in:
		
						commit
						defb86dbc7
					
				@ -291,7 +291,7 @@ namespace FrontendWebApi.ApiControllers
 | 
				
			|||||||
                left join floor on floor.full_name = a.floor_tag order by floor.priority");
 | 
					                left join floor on floor.full_name = a.floor_tag order by floor.priority");
 | 
				
			||||||
                Sub_system sub_System = new Sub_system()
 | 
					                Sub_system sub_System = new Sub_system()
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
                    sub_system_guid = sub_system.sub_system_tag,
 | 
					                    sub_system_tag = sub_system.sub_system_tag,
 | 
				
			||||||
                    left_system_url = sub_system.left_system_url,
 | 
					                    left_system_url = sub_system.left_system_url,
 | 
				
			||||||
                    left_drawing = sub_system.left_drawing,
 | 
					                    left_drawing = sub_system.left_drawing,
 | 
				
			||||||
                    Floors = new List<Floor>(),
 | 
					                    Floors = new List<Floor>(),
 | 
				
			||||||
@ -309,6 +309,7 @@ namespace FrontendWebApi.ApiControllers
 | 
				
			|||||||
                    {
 | 
					                    {
 | 
				
			||||||
                        devices = null,
 | 
					                        devices = null,
 | 
				
			||||||
                        floor_guid = floor.floor_guid,
 | 
					                        floor_guid = floor.floor_guid,
 | 
				
			||||||
 | 
					                        Floor_map_name = floor.Floor_map_name,
 | 
				
			||||||
                        full_name = floor.full_name,
 | 
					                        full_name = floor.full_name,
 | 
				
			||||||
                        InitMapName = floor.InitMapName,
 | 
					                        InitMapName = floor.InitMapName,
 | 
				
			||||||
                        priority = floor.priority
 | 
					                        priority = floor.priority
 | 
				
			||||||
 | 
				
			|||||||
@ -97,7 +97,7 @@ namespace FrontendWebApi.Models
 | 
				
			|||||||
    }
 | 
					    }
 | 
				
			||||||
    public class Sub_system
 | 
					    public class Sub_system
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        public string sub_system_guid { get; set; }
 | 
					        public string sub_system_tag { get; set; }
 | 
				
			||||||
        public string full_name { get; set; }
 | 
					        public string full_name { get; set; }
 | 
				
			||||||
        public int priority { get; set; }
 | 
					        public int priority { get; set; }
 | 
				
			||||||
        public byte left_drawing { get; set; }
 | 
					        public byte left_drawing { get; set; }
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user