B-21350-INT Bulk assignment modal equal assignment button

pkg/handlers/primeapiv2/api.go

@@ -116,8 +116,8 @@ func NewPrimeAPI(handlerConfig handlers.HandlerConfig) *primev2operations.Mymove
 	primeAPIV2.MtoShipmentUpdateMTOShipmentHandler = UpdateMTOShipmentHandler{
 		handlerConfig,
 		shipmentUpdater,
-		handlerConfig.DTODPlanner(),
 		vLocation,
+		handlerConfig.DTODPlanner(),
 	}
 
 	return primeAPIV2

pkg/handlers/primeapiv2/mto_shipment.go

@@ -243,8 +243,8 @@ func (h CreateMTOShipmentHandler) Handle(params mtoshipmentops.CreateMTOShipment
 type UpdateMTOShipmentHandler struct {
 	handlers.HandlerConfig
 	services.ShipmentUpdater
-	planner route.Planner
 	services.VLocation
+	planner route.Planner
 }
 
 // Handle handler that updates a mto shipment

pkg/models/move.go

@@ -105,7 +105,7 @@ type Move struct {
 	TOODestinationAssignedUser                     *OfficeUser           `json:"too_destination_assigned" belongs_to:"office_users" fk_id:"too_destination_assigned_id"`
 	CounselingOfficeID                             *uuid.UUID            `json:"counseling_transportation_office_id" db:"counseling_transportation_office_id"`
 	CounselingOffice                               *TransportationOffice `json:"counseling_transportation_office" belongs_to:"transportation_offices" fk_id:"counseling_transportation_office_id"`
-	PrimeAcknowledgedAt							   *time.Time            `db:"prime_acknowledged_at"`
+	PrimeAcknowledgedAt                            *time.Time            `db:"prime_acknowledged_at"`
 }
 
 type MoveWithEarliestDate struct {

pkg/models/mto_shipments.go

@@ -188,7 +188,7 @@ type MTOShipment struct {
 	DestinationSITAuthEndDate        *time.Time             `json:"destination_sit_auth_end_date" db:"dest_sit_auth_end_date"`
 	MobileHome                       *MobileHome            `json:"mobile_home" has_one:"mobile_home" fk_id:"shipment_id"`
 	MarketCode                       MarketCode             `json:"market_code" db:"market_code"`
-	PrimeAcknowledgedAt				 *time.Time             `db:"prime_acknowledged_at"`
+	PrimeAcknowledgedAt              *time.Time             `db:"prime_acknowledged_at"`
 }
 
 // TableName overrides the table name used by Pop.

pkg/services/office_user/office_user_fetcher.go

@@ -91,6 +91,7 @@ func (o *officeUserFetcherPop) FetchOfficeUsersByRoleAndOffice(appCtx appcontext
 		Where("users_roles.deleted_at IS NULL").
 		Where("office_users.active = TRUE").
 		Order("last_name asc").
+		Order("first_name asc").
 		All(&officeUsers)
 
 	if err != nil {
@@ -120,6 +121,7 @@ func (o *officeUserFetcherPop) FetchSafetyMoveOfficeUsersByRoleAndOffice(appCtx
 		Where("users_privileges.deleted_at IS NULL").
 		Where("privileges.privilege_type = 'safety'").
 		Order("last_name asc").
+		Order("first_name asc").
 		All(&officeUsers)
 
 	if err != nil {