diff --git a/gen/go/proto/resources/dispatch/dispatches.pb.go b/gen/go/proto/resources/dispatch/dispatches.pb.go index a4540f4ca..8d8ba30e5 100644 --- a/gen/go/proto/resources/dispatch/dispatches.pb.go +++ b/gen/go/proto/resources/dispatch/dispatches.pb.go @@ -30,10 +30,11 @@ const ( DISPATCH_STATUS_DECLINED DISPATCH_STATUS = 1 DISPATCH_STATUS_UNASSIGNED DISPATCH_STATUS = 2 DISPATCH_STATUS_UNIT_ASSIGNED DISPATCH_STATUS = 3 - DISPATCH_STATUS_EN_ROUTE DISPATCH_STATUS = 4 - DISPATCH_STATUS_AT_SCENE DISPATCH_STATUS = 5 - DISPATCH_STATUS_NEED_ASSISTANCE DISPATCH_STATUS = 6 - DISPATCH_STATUS_COMPLETED DISPATCH_STATUS = 7 + DISPATCH_STATUS_UNIT_UNASSIGNED DISPATCH_STATUS = 4 + DISPATCH_STATUS_EN_ROUTE DISPATCH_STATUS = 5 + DISPATCH_STATUS_AT_SCENE DISPATCH_STATUS = 6 + DISPATCH_STATUS_NEED_ASSISTANCE DISPATCH_STATUS = 7 + DISPATCH_STATUS_COMPLETED DISPATCH_STATUS = 8 ) // Enum value maps for DISPATCH_STATUS. @@ -43,20 +44,22 @@ var ( 1: "DECLINED", 2: "UNASSIGNED", 3: "UNIT_ASSIGNED", - 4: "EN_ROUTE", - 5: "AT_SCENE", - 6: "NEED_ASSISTANCE", - 7: "COMPLETED", + 4: "UNIT_UNASSIGNED", + 5: "EN_ROUTE", + 6: "AT_SCENE", + 7: "NEED_ASSISTANCE", + 8: "COMPLETED", } DISPATCH_STATUS_value = map[string]int32{ "NEW": 0, "DECLINED": 1, "UNASSIGNED": 2, "UNIT_ASSIGNED": 3, - "EN_ROUTE": 4, - "AT_SCENE": 5, - "NEED_ASSISTANCE": 6, - "COMPLETED": 7, + "UNIT_UNASSIGNED": 4, + "EN_ROUTE": 5, + "AT_SCENE": 6, + "NEED_ASSISTANCE": 7, + "COMPLETED": 8, } ) @@ -583,21 +586,22 @@ var file_resources_dispatch_dispatches_proto_rawDesc = []byte{ 0x0b, 0x5f, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x42, 0x0a, 0x0a, 0x08, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x42, 0x07, 0x0a, 0x05, - 0x5f, 0x75, 0x73, 0x65, 0x72, 0x2a, 0x8b, 0x01, 0x0a, 0x0f, 0x44, 0x49, 0x53, 0x50, 0x41, 0x54, + 0x5f, 0x75, 0x73, 0x65, 0x72, 0x2a, 0xa0, 0x01, 0x0a, 0x0f, 0x44, 0x49, 0x53, 0x50, 0x41, 0x54, 0x43, 0x48, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x12, 0x07, 0x0a, 0x03, 0x4e, 0x45, 0x57, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x44, 0x45, 0x43, 0x4c, 0x49, 0x4e, 0x45, 0x44, 0x10, 0x01, 0x12, 0x0e, 0x0a, 0x0a, 0x55, 0x4e, 0x41, 0x53, 0x53, 0x49, 0x47, 0x4e, 0x45, 0x44, 0x10, 0x02, 0x12, 0x11, 0x0a, 0x0d, 0x55, 0x4e, 0x49, 0x54, 0x5f, 0x41, 0x53, 0x53, 0x49, 0x47, 0x4e, 0x45, - 0x44, 0x10, 0x03, 0x12, 0x0c, 0x0a, 0x08, 0x45, 0x4e, 0x5f, 0x52, 0x4f, 0x55, 0x54, 0x45, 0x10, - 0x04, 0x12, 0x0c, 0x0a, 0x08, 0x41, 0x54, 0x5f, 0x53, 0x43, 0x45, 0x4e, 0x45, 0x10, 0x05, 0x12, - 0x13, 0x0a, 0x0f, 0x4e, 0x45, 0x45, 0x44, 0x5f, 0x41, 0x53, 0x53, 0x49, 0x53, 0x54, 0x41, 0x4e, - 0x43, 0x45, 0x10, 0x06, 0x12, 0x0d, 0x0a, 0x09, 0x43, 0x4f, 0x4d, 0x50, 0x4c, 0x45, 0x54, 0x45, - 0x44, 0x10, 0x07, 0x42, 0x45, 0x5a, 0x43, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, - 0x6d, 0x2f, 0x67, 0x61, 0x6c, 0x65, 0x78, 0x72, 0x74, 0x2f, 0x66, 0x69, 0x76, 0x65, 0x6e, 0x65, - 0x74, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x67, 0x6f, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x72, - 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x2f, 0x64, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, - 0x68, 0x3b, 0x64, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, + 0x44, 0x10, 0x03, 0x12, 0x13, 0x0a, 0x0f, 0x55, 0x4e, 0x49, 0x54, 0x5f, 0x55, 0x4e, 0x41, 0x53, + 0x53, 0x49, 0x47, 0x4e, 0x45, 0x44, 0x10, 0x04, 0x12, 0x0c, 0x0a, 0x08, 0x45, 0x4e, 0x5f, 0x52, + 0x4f, 0x55, 0x54, 0x45, 0x10, 0x05, 0x12, 0x0c, 0x0a, 0x08, 0x41, 0x54, 0x5f, 0x53, 0x43, 0x45, + 0x4e, 0x45, 0x10, 0x06, 0x12, 0x13, 0x0a, 0x0f, 0x4e, 0x45, 0x45, 0x44, 0x5f, 0x41, 0x53, 0x53, + 0x49, 0x53, 0x54, 0x41, 0x4e, 0x43, 0x45, 0x10, 0x07, 0x12, 0x0d, 0x0a, 0x09, 0x43, 0x4f, 0x4d, + 0x50, 0x4c, 0x45, 0x54, 0x45, 0x44, 0x10, 0x08, 0x42, 0x45, 0x5a, 0x43, 0x67, 0x69, 0x74, 0x68, + 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x61, 0x6c, 0x65, 0x78, 0x72, 0x74, 0x2f, 0x66, + 0x69, 0x76, 0x65, 0x6e, 0x65, 0x74, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x67, 0x6f, 0x2f, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x2f, 0x64, 0x69, + 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x3b, 0x64, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/gen/go/proto/services/centrum/dispatches.go b/gen/go/proto/services/centrum/dispatches.go index 24b71b1bb..373678dd6 100644 --- a/gen/go/proto/services/centrum/dispatches.go +++ b/gen/go/proto/services/centrum/dispatches.go @@ -426,6 +426,16 @@ func (s *Server) AssignDispatch(ctx context.Context, req *AssignDispatchRequest) for k := 0; k < len(req.ToRemove); k++ { if dsp.Units[i].UnitId == req.ToRemove[k] { dsp.Units = utils.RemoveFromSlice(dsp.Units, i) + + if _, err := s.updateDispatchStatus(ctx, userInfo, dsp, &dispatch.DispatchStatus{ + DispatchId: dsp.Id, + UnitId: req.ToRemove[k], + UserId: &userInfo.UserId, + Status: dispatch.DISPATCH_STATUS_UNIT_UNASSIGNED, + }); err != nil { + return nil, ErrFailedQuery + } + break } } @@ -474,6 +484,15 @@ func (s *Server) AssignDispatch(ctx context.Context, req *AssignDispatchRequest) DispatchId: dsp.Id, Unit: unit, }) + + if _, err := s.updateDispatchStatus(ctx, userInfo, dsp, &dispatch.DispatchStatus{ + DispatchId: dsp.Id, + UnitId: unit.Id, + UserId: &userInfo.UserId, + Status: dispatch.DISPATCH_STATUS_UNIT_ASSIGNED, + }); err != nil { + return nil, ErrFailedQuery + } } } diff --git a/gen/ts/resources/dispatch/dispatches.ts b/gen/ts/resources/dispatch/dispatches.ts index e449009d4..2ef02ccd8 100644 --- a/gen/ts/resources/dispatch/dispatches.ts +++ b/gen/ts/resources/dispatch/dispatches.ts @@ -162,21 +162,25 @@ export enum DISPATCH_STATUS { */ UNIT_ASSIGNED = 3, /** - * @generated from protobuf enum value: EN_ROUTE = 4; + * @generated from protobuf enum value: UNIT_UNASSIGNED = 4; */ - EN_ROUTE = 4, + UNIT_UNASSIGNED = 4, /** - * @generated from protobuf enum value: AT_SCENE = 5; + * @generated from protobuf enum value: EN_ROUTE = 5; */ - AT_SCENE = 5, + EN_ROUTE = 5, /** - * @generated from protobuf enum value: NEED_ASSISTANCE = 6; + * @generated from protobuf enum value: AT_SCENE = 6; */ - NEED_ASSISTANCE = 6, + AT_SCENE = 6, /** - * @generated from protobuf enum value: COMPLETED = 7; + * @generated from protobuf enum value: NEED_ASSISTANCE = 7; */ - COMPLETED = 7 + NEED_ASSISTANCE = 7, + /** + * @generated from protobuf enum value: COMPLETED = 8; + */ + COMPLETED = 8 } // @generated message type with reflection information, may provide speed optimized methods class Dispatch$Type extends MessageType { diff --git a/proto/resources/dispatch/dispatches.proto b/proto/resources/dispatch/dispatches.proto index dd5a6551e..2281a225b 100644 --- a/proto/resources/dispatch/dispatches.proto +++ b/proto/resources/dispatch/dispatches.proto @@ -42,10 +42,11 @@ enum DISPATCH_STATUS { DECLINED = 1; UNASSIGNED = 2; UNIT_ASSIGNED = 3; - EN_ROUTE = 4; - AT_SCENE = 5; - NEED_ASSISTANCE = 6; - COMPLETED = 7; + UNIT_UNASSIGNED = 4; + EN_ROUTE = 5; + AT_SCENE = 6; + NEED_ASSISTANCE = 7; + COMPLETED = 8; } message DispatchStatus { diff --git a/src/components/centrum/Centrum.vue b/src/components/centrum/Centrum.vue index ce5deafca..7441f7065 100644 --- a/src/components/centrum/Centrum.vue +++ b/src/components/centrum/Centrum.vue @@ -115,7 +115,7 @@ async function startStream(): Promise { if (idx === -1) { dispatches.value?.unshift(resp.change.dispatchAssigned); } else { - dispatches.value![idx].units = resp.change.dispatchAssigned.units; + dispatches.value![idx] = resp.change.dispatchAssigned; } } else if (resp.change.oneofKind === 'unitUpdate') { const id = resp.change.unitUpdate.id;