Skip to content
Snippets Groups Projects

Fix/import file

Merged Fix/import file
fix/import_file into master
1 unresolved thread
Merged Carlos Vega requested to merge fix/import_file into master
1 unresolved thread

Closes #268 (closed)

Merge request reports

Pipeline #7349 passed

Stage: test

    Pipeline passed for 3c512e1c on fix/import_file

    Test coverage 92.16% (0.00%) from 1 job
    Approval is optional

    Merged by Piotr GawronPiotr Gawron 6 years ago (Nov 12, 2018 12:27pm UTC)

    Merge details

    Pipeline #7350 passed

    Stage: test

      Pipeline passed for fbe0ba62 on master

      Test coverage 91.71% (0.00%) from 1 job

      Activity

      Filter activity
      • Approvals
      • Assignees & reviewers
      • Comments (from bots)
      • Comments (from users)
      • Commits & branches
      • Edits
      • Labels
      • Lock status
      • Mentions
      • Merge request status
      • Tracking
      smash/import_file.py
      483 485
      484 486 # creatre appointment
      485 487 appointment, _ = Appointment.objects.update_or_create(
      486 visit=visit, length=sum(
      487 [a.default_duration for a in appointment_types]),
      488 visit=visit, length=sum([a.default_duration for a in appointment_types]),
      488 489 flying_team=ft, location=location,
      489 status=Appointment.APPOINTMENT_STATUS_FINISHED, datetime_when=datetime_when)
      490 status=Appointment.APPOINTMENT_STATUS_SCHEDULED, datetime_when=datetime_when,
    • Piotr Gawron assigned to @carlos.vega

      assigned to @carlos.vega

    • Carlos Vega added 3 commits

      added 3 commits

      • c5ce8a3a - fix problem with call to 'web.api.workers.daily_planning.availabilities$' if flags have no image
      • 3f9e309d - Merge branch 'hotfix/import_file' into fix/import_file
      • 3c512e1c - merged hotfix/import_file which was intended for little changes but its name is confusing

      Compare with previous version

    • Carlos Vega assigned to @piotr.gawron

      assigned to @piotr.gawron

    • Carlos Vega
      Carlos Vega @carlosvega ·
      Author Owner

      As soon as this merge request is merged we can remove hotfix/import_file branch as well.

    • Piotr Gawron mentioned in commit fbe0ba62

      mentioned in commit fbe0ba62

    • Piotr Gawron merged

      merged

      • Please register or sign in to reply