up: various twig templates

* various twig updates

assets/js/app/itinerary.js

@@ -17,7 +17,6 @@ export function addLocationToItinerary() {
     let origin = document.getElementById('origin').value;
     let destination = document.getElementById('destination').value;
     let departure = document.getElementById('departure').value;
-    let arrival = document.getElementById('arrival').value;
     let caseMileage = document.getElementById('case-mileage').checked;
     let caseId = document.getElementById('case-filter').value;
 
@@ -32,7 +31,6 @@ export function addLocationToItinerary() {
             origin: origin,
             destination: destination,
             departure: departure,
-            arrival: arrival,
             caseMileage: caseMileage
         })
     })

assets/js/app/notes.js

@@ -28,10 +28,11 @@ export function filterNotes()
             noteList.innerHTML = '';
 
             data.forEach(i => {
+                let duration = (parseInt(i.duration) / 60).toFixed(2);
                 noteList.innerHTML += `
                 <tr>
                     <td>${i.date}<br/>
-                        ${i.startTime}-${i.endTime} (${i.duration})</td>
+                        ${i.startTime}-${i.endTime} (${duration})</td>
                     <td class='text-center'>${i.location}</td>
                     <td class='text-center'>${i.method}</td>
                     <td'>${i.members}</td>
@@ -43,4 +44,48 @@ export function filterNotes()
                 </tr>`;
             })
         });
-}
+}
+
+export function calcTime(precision = 15) {
+    if (!document.getElementById('note_form_startTime').value || !document.getElementById('note_form_endTime').value) {
+        console.log('ending');
+        return;
+    }
+
+    let st = document.getElementById('note_form_startTime').value.split(':');
+    let et = document.getElementById('note_form_endTime').value.split(':');
+
+    let sd = new Date();
+    let ed = new Date();
+
+    sd.setHours(st[0]);
+    sd.setMinutes(st[1]);
+    sd.setSeconds(0);
+    ed.setHours(et[0]);
+    ed.setMinutes(et[1]);
+    ed.setSeconds(0);
+
+    let timediff = (ed.getTime() - sd.getTime()) / 1000;
+    let increments = (timediff / 60) / precision;
+
+    if (isFloat(increments)) {
+        let mod = (timediff / 60) % precision;
+        if (mod >= (precision / 2)) {
+            increments++;
+        }
+        increments = parseInt(increments);
+    }
+
+    document.getElementById('case-mins').value = (increments * precision)+' minutes';
+    document.getElementById('case-hours').value = ((increments * precision) / 60)+' hours';
+}
+
+export function autosaveNote()
+{
+
+}
+
+export function checkNotes() {
+    
+}
+

config/packages/security.yaml

@@ -7,7 +7,7 @@ security:
     # used to reload user from session & other features (e.g. switch_user)
     app_user_provider:
       entity:
-        class: App\Entity\User
+        class: App\Entity\System\User
         property: username
     # used to reload user from session & other features (e.g. switch_user)
   firewalls:

src/Controller/Admin/AdminController.php

@@ -136,7 +136,7 @@ class AdminController extends AbstractController
                  ->setLevel($form->get('level')->getData())
                  ->setCompany($admin->getCompany())
                  ->setActive(true)
-                 ->setPasswordChanged(new DateTime('now', new DateTimeZone($_ENV['COMPANY_TIMEZONE'])))
+                 ->setPasswordChanged(new DateTime('1970-01-01 00:00:00', new DateTimeZone($_ENV['COMPANY_TIMEZONE'])))
             ;
 
             if ($form->get('imageName')->getData()) {

src/Controller/Case/CaseController.php

@@ -417,45 +417,4 @@ class CaseController extends AbstractController
             )
         );
     }
-
-    #[Route('/assign-case-doc/{caseId}/{memberId}', name: 'app_assign_case_documents')]
-    public function assignCaseDocument(string $caseId, string $memberId, Request $request, #[CurrentUser()] User $user): Response
-    {
-        $case = $this->entityManager->getRepository(MemberCase::class)->find($caseId);
-        $member = $this->entityManager->getRepository(Member::class)->find($memberId);
-        $companyDocs = $this->entityManager->getRepository(CompanyDocument::class)->findBy(['company' => $user->getCompany()]);
-
-        $form = $this->createForm(CaseDocumentFormType::class, null, ['docs' => $companyDocs]);
-
-        $form->handleRequest($request);
-
-        if ($form->isSubmitted() && $form->isValid()) {
-            $docs = $form['document']->getData();
-            dd($docs);
-
-            $this->entityManager->persist($cd);
-            $this->entityManager->flush();
-
-            $this->redirectToRoute('app_case_members', ['id' => $caseId]);
-        }
-
-        return $this->render(
-            'internal/cases/members/assign-document.html.twig',
-            array_merge(
-                $this->navLinks,
-                [
-                    'notifications' => Libs::getMessages($user, $this->entityManager),
-                    'breadcrumbs' => [
-                        new Breadcrumb($this->generateUrl('app_dashboard'), 'Dashboard'),
-                        new Breadcrumb($this->generateUrl('app_list_cases'), 'List Cases'),
-                        new Breadcrumb($this->generateUrl('app_case_members', ['id' => $caseId]), 'Case Members')
-                    ],
-                    'form' => $form,
-                    'case' => $case,
-                    'member' => $member,
-                    'docs' => $companyDocs,
-                ]
-            )
-        );
-    }
 }

src/Controller/Case/NoteController.php

@@ -78,6 +78,10 @@ class NoteController extends AbstractController
     #[Route('/add-note/{referralId}', name: 'app_add_note')]
     public function addNote(#[CurrentUser()] User $user, Request $request, ?string $referralId = null): Response
     {
+        if (substr($referralId, 0, 4) == 'case') {
+            throw $this->createNotFoundException('Select Referral from dropdown');
+        }
+
         /** @var Referral $referral */
         $referral = $this->entityManager->getRepository(Referral::class)->find($referralId);
         $this->entityManager->getRepository(Referral::class)->populateNotes($referral);
@@ -158,16 +162,24 @@ class NoteController extends AbstractController
     public function editNote(string $noteId, string $noteType, #[CurrentUser()] User $user, Request $request): Response
     {
         $form = null;
+        $members = [];
 
         /** @var VisitNote|StandardNote $note */
         if ($noteType == 'visit') {
+            /** @var VisitNote $note */
             $note = $this->entityManager->getRepository(VisitNote::class)->find($noteId);
-            $members = $this->entityManager->getRepository(Member::class)->findBy(['memberCase' => $note->getReferral()->getMemberCase()]);
-            $form = $this->createForm(VisitNoteFormType::class, $note, ['members' => $members]);
+            $members = $this->entityManager->getRepository(Member::class)->getMembersByCaseAndNote($note->getReferral()->getMemberCase(), $note);
+
+            $form = $this->createForm(VisitNoteFormType::class, $note, [
+                'members' => $members,
+                //'members' => $this->entityManager->getRepository(Member::class)->findBy(['memberCase' => $note->getReferral()->getMemberCase()])
+            ]);
         } elseif ($noteType == 'standard') {
             $note = $this->entityManager->getRepository(StandardNote::class)->find($noteId);
-            $members = $this->entityManager->getRepository(Member::class)->findBy(['memberCase' => $note->getReferral()->getMemberCase()]);
-            $form = $this->createForm(StandardNoteFormType::class, $note, ['members' => $members]);
+            
+            $form = $this->createForm(StandardNoteFormType::class, $note, [
+                'members' => $members,
+            ]);
         }
 
         return $this->render(
@@ -182,7 +194,8 @@ class NoteController extends AbstractController
                     'note' => $note,
                     'referral' => $note->getReferral(),
                     'form' => $form,
-                    'noteType' => $noteType
+                    'noteType' => $noteType,
+                    'members' => $members,
                 ]
             )
         );

src/Controller/Case/ReferralController.php

@@ -120,7 +120,6 @@ class ReferralController extends AbstractController
     public function editReferral(Request $request, #[CurrentUser()] User $user, string $caseId, string $referralId): Response
     {
         $this->denyAccessUnlessGranted(['ROLE_ADMIN', 'ROLE_CASE_MANAGER']);
-        $this->msgs = Libs::getMessages($user, $this->entityManager);
         
         $referral = $this->entityManager->getRepository(Referral::class)->find($referralId);
         $case = $this->entityManager->getRepository(MemberCase::class)->find($caseId);
@@ -151,7 +150,7 @@ class ReferralController extends AbstractController
                         new Breadcrumb($this->generateUrl('app_list_referrals', ['id' => $case->getId()]), 'Referrals'),
                         new Breadcrumb($this->generateUrl('app_case_edit_referral', ['caseId' => $case->getId(), 'referralId' => $referral->getId()]), 'Edit Referral'),
                     ],
-                    'notifications' => $this->msgs,
+                    'notifications' => Libs::getMessages($user, $this->entityManager),
                     'case' => $case,
                     'form' => $form,
                     'referral' => $referral,

src/Controller/System/AjaxController.php

@@ -141,7 +141,10 @@ class AjaxController extends AbstractController
         $route = Libs::getRouteDistance($origin, $destination);
 
         if (!$route) {
-            return $this->json(['success' => false, 'message' => 'No route found']);
+            return $this->json([
+                'success' => false,
+                'message' => 'No route found'
+            ]);
         }
 
         $ci = new CaseItinerary();
@@ -163,7 +166,10 @@ class AjaxController extends AbstractController
             'success',
             'Location added to itinerary'
         );
-        return $this->json(['success' => true, 'message' => 'Location added to itinerary']);
+        return $this->json([
+            'success' => true,
+            'message' => 'Location added to itinerary'
+        ]);
     }
 
     #[Route('/api/filter-itinerary-by-case', name: 'ajax_filter_itinerary_by_case')]

src/Controller/System/DefaultController.php

@@ -39,6 +39,19 @@ class DefaultController extends AbstractController
         $this->navLinks = NavList::LIST;
     }
 
+    #[Route('/up', name: 'app_up')]
+    public function up(): Response
+    {
+        $cnx = $this->entityManager->getConnection();
+        $cnx->connect();
+        $connected = $cnx->isConnected();
+        if ($connected) {
+            return $this->json(true, Response::HTTP_OK);
+        } else {
+            return $this->json(false, Response::HTTP_SERVICE_UNAVAILABLE);
+        }
+    }
+
     #[Route('/dashboard', name: 'app_dashboard')]
     public function dashboard(Request $request, #[CurrentUser()] ?User $user): Response
     {

src/Controller/System/MessageController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Controller;
+namespace App\Controller\System;
 
 use App\Entity\System\Messages;
 use App\Entity\Staff\Supervision;

src/Entity/Case/Member.php

@@ -103,11 +103,19 @@ class Member
     #[ORM\Column]
     private ?bool $dcsApproved = null;
 
+    private ?bool $checked = false;
+
     public function getId(): ?Uuid
     {
         return $this->id;
     }
 
+    public function setId(?Uuid $id): static
+    {
+        $this->id = $id;
+        return $this;
+    }
+
     public function getCaseId(): ?MemberCase
     {
         return $this->memberCase;
@@ -451,4 +459,16 @@ class Member
 
         return $this;
     }
+
+    public function isChecked(): bool
+    {
+        return $this->checked;
+    }
+
+    public function setChecked(bool $checked): static
+    {
+        $this->checked = $checked;
+
+        return $this;
+    }
 }

src/Entity/Case/MemberCase.php

@@ -113,6 +113,9 @@ class MemberCase
     #[ORM\OneToMany(targetEntity: StaffNote::class, mappedBy: 'memberCase')]
     private Collection $staffNotes;
 
+    #[ORM\Column]
+    private ?int $rate = null;
+
     public function __construct()
     {
         $this->userCases = new ArrayCollection();
@@ -515,4 +518,16 @@ class MemberCase
         $this->staffNotes->clear();
         return $this;
     }
+
+    public function getRate(): ?int
+    {
+        return $this->rate;
+    }
+
+    public function setRate(int $rate): static
+    {
+        $this->rate = $rate;
+
+        return $this;
+    }
 }

src/Entity/Case/StandardNote.php

@@ -30,8 +30,8 @@ class StandardNote extends Note implements JsonSerializable
     {
         $members = [];
         foreach ($this->getMembers() as $member) {
-            /** @var Member $member */
-            $members[] = $member->getName();
+            /** @var StandardNoteMember $member */
+            $members[] = $member->getPerson()->getName();
         }
         return [
             'id' => $this->getId()->toString(),

src/Entity/Case/VisitNote.php

@@ -166,8 +166,8 @@ class VisitNote extends Note implements JsonSerializable
     {
         $members = [];
         foreach ($this->getMembers() as $member) {
-            /** @var Member $member */
-            $members[] = $member->getName();
+            /** @var VisitNoteMembers $member */
+            $members[] = $member->getPerson()->getName();
         }
         return [
             'id' => $this->getId()->toString(),

src/Entity/Company/Company.php

@@ -52,6 +52,9 @@ class Company
     #[ORM\Column(type: Types::STRING, length: 255, nullable: true)]
     private ?string $companyLogo = null;
 
+    #[ORM\Column(length: 64)]
+    private ?string $vendorId = null;
+
     /**
      * @var Collection<int, User>
      */
@@ -234,6 +237,18 @@ class Company
         return $this;
     }
 
+    public function getVendorId(): ?string
+    {
+        return $this->vendorId;
+    }
+
+    public function setVendorId(string $vendorId): static
+    {
+        $this->vendorId = $vendorId;
+
+        return $this;
+    }
+
     public function __toString(): string
     {
         $url = ($this->url ? "<br/><a href='$this->url' target='_blank'>$this->url</a>" : '');

src/Form/CompanyFormType.php

@@ -45,6 +45,7 @@ class CompanyFormType extends AbstractType
             ]) 
             ->add('url', UrlType::class)
             ->add('companyLogo', FileType::class)
+            ->add('vendorId', TextType::class)
         ;
     }
 

src/Form/MemberCaseFormType.php

@@ -11,6 +11,7 @@ use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\EnumType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\Extension\Core\Type\NumberType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -65,6 +66,9 @@ class MemberCaseFormType extends AbstractType
             ->add('county', EnumType::class, [
                 'class' => County::class,
             ])
+            ->add('rate', NumberType::class, [
+                'required' => true
+            ])
         ;
     }
 

src/Form/StandardNoteFormType.php

@@ -2,14 +2,13 @@
 
 namespace App\Form;
 
-use App\Entity\Case\Member;
 use App\Entity\Case\StandardNote;
 use App\Enums\Case\NoteLocation;
 use App\Enums\Case\NoteMethod;
 use App\Enums\Case\NoteStatus;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\EnumType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -19,6 +18,11 @@ class StandardNoteFormType extends AbstractType
     {
         $members = $options['members'];
 
+        $ids = [];
+        foreach ($members as $idx => $member) {
+            $ids[$idx] = $member->getId()->toString();
+        }
+
         $builder
             ->add('date', null, [
                 'widget' => 'single_text',
@@ -42,9 +46,15 @@ class StandardNoteFormType extends AbstractType
                     'placeholder' => 'Note',
                 ],
             ])
-            ->add('members', EntityType::class, [
-                'class' => Member::class,
+            ->add('members', ChoiceType::class, [
+                //'class' => Member::class,
                 'choices' => $members,
+                'choice_attr' => function ($member) {
+                    return [
+                        'checked' => $member->isChecked(),
+                        'value' => $member->getId()->toString()
+                    ];
+                },
                 'multiple' => true,
                 'expanded' => true,
                 'choice_label' => 'name',

src/Form/VisitNoteFormType.php

@@ -8,8 +8,8 @@ use App\Enums\Case\NoteLocation;
 use App\Enums\Case\NoteMethod;
 use App\Enums\Case\NoteStatus;
 use App\Enums\Case\VisitQualityLevel;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\EnumType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -20,6 +20,11 @@ class VisitNoteFormType extends AbstractType
     {
         $members = $options['members'];
 
+        $ids = [];
+        foreach ($members as $idx => $member) {
+            $ids[$idx] = $member->getId()->toString();
+        }
+
         $builder
             ->add('date', null, [
                 'widget' => 'single_text',
@@ -58,9 +63,15 @@ class VisitNoteFormType extends AbstractType
             ->add('childFocused', EnumType::class, [
                 'class' => VisitQualityLevel::class
             ])
-            ->add('members', EntityType::class, [
-                'class' => Member::class,
+            ->add('members', ChoiceType::class, [
+                //'class' => Member::class,
                 'choices' => $members,
+                'choice_attr' => function ($member) {
+                    return [
+                        'checked' => $member->isChecked(),
+                        'value' => $member->getId()->toString()
+                    ];
+                },
                 'multiple' => true,
                 'expanded' => true,
                 'choice_label' => 'name',

src/Repository/Case/MemberRepository.php

@@ -3,9 +3,17 @@
 namespace App\Repository\Case;
 
 use App\Entity\Case\Member;
-use App\Entity\Case\MemberCase;;
+use App\Entity\Case\MemberCase;
+use App\Entity\Case\Note;
+use App\Entity\Case\StandardNote;
+use App\Entity\Case\VisitNote;
+use App\Enums\Case\RelationshipType;
+use App\Enums\System\GenderType;
+
+;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
+use Symfony\Component\Uid\Uuid;
 
 /**
  * @extends ServiceEntityRepository<Member>
@@ -28,6 +36,73 @@ class MemberRepository extends ServiceEntityRepository
         ;
     }
 
+    public function getMembersByCaseAndNote(MemberCase $case, Note $note)
+    {
+        $table = 'standard_note_member';
+        if ($note instanceof VisitNote) {
+            $table = 'visit_note_members';
+        }
+
+        $conn = $this->getEntityManager()->getConnection();
+        $sql = "SELECT m.*,
+            (
+                SELECT COUNT(1)
+                FROM {$table} n
+                WHERE n.note_id = :note_id
+                      AND
+                      n.person_id = m.id
+            ) as 'checked'
+            FROM member m
+            JOIN member_case mc ON mc.id = m.member_case_id
+            WHERE
+             mc.id = :case_id";
+        $stmt = $conn->prepare($sql);
+
+        $result = $stmt->executeQuery([
+            'note_id' => $note->getId()->toBinary(),
+            'case_id' => $case->getId()->toBinary()
+        ]);
+
+        $res = [];
+
+        foreach ($result->fetchAllAssociative() as $row) {
+            $member = new Member();
+            $member->setId(Uuid::fromBinary($row['id']))
+                   ->setCaseId($this->getEntityManager()->find(MemberCase::class, Uuid::fromBinary($row['member_case_id'])))
+                   ->setFirstName($row['first_name'])
+                   ->setLastName($row['last_name'])
+                   ->setRelationship(RelationshipType::from($row['relationship']))
+                   ->setPersonalId($row['personal_id'])
+                   ->setGender(GenderType::from($row['gender']))
+                   ->setDob(new \DateTime($row['dob']))
+                   ->setLanguage($row['language'])
+                   ->setEmergencyContact($row['emergency_contact'])
+                   ->setPhone($row['phone'])
+                   ->setDayPhone($row['day_phone'])
+                   ->setEveningPhone($row['evening_phone'])
+                   ->setCellPhone($row['cell_phone'])
+                   ->setEmail($row['email'])
+                   ->setSchool($row['school'])
+                   ->setAddress($row['address'])
+                   ->setCity($row['city'])
+                   ->setState($row['state'])
+                   ->setZip($row['zip'])
+                   ->setMaritalStatus($row['marital_status'])
+                   ->setChild($row['is_child'])
+                   ->setParent($row['is_parent'])
+                   ->setAdultChild($row['is_adult_child'])
+                   ->setLegalGuardian($row['is_legal_guardian'])
+                   ->setParentsLiveTogether($row['parents_live_together'])
+                   ->setDcsApproved($row['dcs_approved'])
+                   ->setChecked($row['checked'])
+            ;
+
+            $res[] = $member;
+        }
+
+        return $res;
+    }
+
     //    /**
     //     * @return Member[] Returns an array of Member objects
     //     */

src/Security/UserChecker.php

@@ -2,7 +2,7 @@
 
 namespace App\Security;
 
-use App\Entity\User as AppUser;
+use App\Entity\System\User;
 use DateInterval;
 use DateTime;
 use DateTimeZone;
@@ -16,7 +16,7 @@ class UserChecker extends AbstractController implements UserCheckerInterface
 {
     public function checkPreAuth(UserInterface $user): void
     {
-        if (!$user instanceof AppUser) {
+        if (!$user instanceof User) {
             return;
         }
 
@@ -31,7 +31,7 @@ class UserChecker extends AbstractController implements UserCheckerInterface
         $dt = new DateTime('now', new DateTimeZone($_ENV['COMPANY_TIMEZONE']));
         $dt->sub(DateInterval::createFromDateString('120 days'));
 
-        if (!$user instanceof AppUser) {
+        if (!$user instanceof User) {
             return;
         }
 

templates/internal/admin/assign-supervisor.html.twig

@@ -25,7 +25,7 @@
 									<div class='input-group input-group-outline mb-3 is-filled'>
 										<label for='user_form_job' class='form-label'>Job</label>
 										<select name='{{ field_name(form.supervisor) }}' id='user_form_supervisor' class='form-control'>
-											<option value=''></option>
+											<option value=''>-- Select Supervisor --</option>
 											{% for s in supervisors %}
 												<option value='{{ s.id }}' {% if user.supervisor and user.supervisor.id == s.id %} selected="selected" {% endif %}>{{ s.name }}</option>
 											{% endfor %}

templates/internal/admin/cases/add-case.html.twig

@@ -7,7 +7,6 @@
 		{{ block('topnav', 'internal/libs/top-nav.html.twig') }}
 
 		<section>
-
 			<div class="card card-plain">
 				<div class="card-header">
 					<h4 class="font-weight-bolder">Case Info</h4>
@@ -87,6 +86,11 @@
 										{% endfor %}
 									</select>
 								</div>
+
+								<div class='input-group input-group-outline mb-3'>
+									<label for='case_form_rate'></label>
+									<input type='number' name='{{ field_name(form.rate) }}' id='case_form_rate' class='form-control' required='required'/>
+								</div>
 							</div>
 							<div class='col'>
 								<div class='input-group input-group-outline mb-3'>

templates/internal/admin/cases/edit-case.html.twig

@@ -30,12 +30,12 @@
 								</div>
 
 								<div class='input-group input-group-outline mb-3 is-filled'>
-									<label for='case_form_admitDate' class='form-label'>Admit Date</label>
+									<label for='case_form_admitDate' class='form-label'></label>
 									<input type='date' name='{{ field_name(form.admitDate) }}' id='case_form_admitDate' value='{{ case.admitDate|date('Y-m-d', company_timezone) }}' class='form-control'/>
 								</div>
 
 								<div class='input-group input-group-outline mb-3{% if case.closeDate %} is-filled{% endif %}'>
-									<label for='case_form_closeDate' class='form-label'>Close Date</label>
+									<label for='case_form_closeDate' class='form-label'></label>
 									<input type='date' name='{{ field_name(form.closeDate) }}' id='case_form_closeDate' value='{% if case.closeDate %}{{ case.closeDate|date('Y-m-d', company_timezone) }}{% endif %}' class='form-control'/>
 								</div>
 
@@ -46,14 +46,14 @@
 
 								<div class='input-group input-group-outline mb-3 is-filled'>
 									<label for='case_form_referralType' class='form-label'>Referral Type</label>
-									<input type='text' name='{{ field_name(form.referralType) }}' id='case_form_referralType' value='{{ case.referralType }}' class='form-control'/>
+									<input type='text' name='{{ field_name(form.referralType) }}' id='case_form_referralType' value='{{ case.referralType.value }}' class='form-control'/>
 								</div>
 
 								<div class='input-group input-group-outline mb-3 is-filled'>
 									<label for='case_form_level' class='form-label'>Level</label>
 									<select name='{{ field_name(form.level) }}' id='case_form_level' class='form-control'>
 										<option value=''></option>
-										{% for l in enum('App\\Enums\\CaseLevel').cases() %}
+										{% for l in enum('App\\Enums\\Case\\CaseLevel').cases() %}
 											<option value='{{ l.value }}' {% if case.level.value == l.value %} selected='selected'{% endif %}>{{ l.name }}</option>
 										{% endfor %}
 									</select>
@@ -88,6 +88,11 @@
 										{% endfor %}
 									</select>
 								</div>
+
+								<div class='input-group input-group-outline mb-3 is-filled'>
+									<label for='case_form_rate'></label>
+									<input type='number' name='{{ field_name(form.rate) }}' id='case_form_rate' class='form-control' value='{{ (field_value(form.rate)/100)|number_format(2) }}' required='required'/>
+								</div>
 							</div>
 							<div class='col'>
 								<div class='input-group input-group-outline mb-3 is-filled'>
@@ -129,12 +134,12 @@
 									<label for='case_form_county' class='form-label'>County</label>
 									<select name='{{ field_name(form.county) }}' id='case_form_county' class='form-control'>
 										<option value=''></option>
-										{% for c in enum('App\\Enums\\County').cases() %}
+										{% for c in enum('App\\Enums\\System\\County').cases() %}
 											{% set selected="" %}
 											{% if case.county.value %}
 												{% set selected=" selected='selected'" %}
 											{% endif %}
-											<option value='{{ c.value }}' {{ selected }}>{{ c.name }}</option>
+											<option value='{{ c.value }}' {{ selected }}>{{ c.name|lower|capitalize }}</option>
 										{% endfor %}
 									</select>
 								</div>

templates/internal/admin/cases/list-cases.html.twig

@@ -46,6 +46,7 @@
 											<th class='text-center text-uppercase text-secondary text-xxs font-weight-bolder opacity-7'>County</th>
 											<th class='text-center text-uppercase text-secondary text-xxs font-weight-bolder opacity-7'>Referral Count</th>
 											<th class="text-center text-uppercase text-secondary text-xxs font-weight-bolder opacity-7">Case Worker</th>
+											<th class='text-center text-uppercase text-secondary text-xxs font-weight-bolder opacity-7'>Rate</th>
 											<th class="text-secondary opacity-7"></th>
 										</tr>
 									</thead>
@@ -84,6 +85,9 @@
 														{% endif %}
 													</p>
 												</td>
+												<td class='align-middle text-center text-xs'>
+													{{ (c.rate/100)|number_format(2) }}
+												</td>
 												<td class='align-right'>
 													{% if is_granted('ROLE_CASE_MANAGER') or is_granted('ROLE_ADMIN') %}
 														<a href='{{ path('app_edit_case', {id: c.id}) }}' class='text-secondary ' title='Edit Case' data-toggle='tooltip'>

templates/internal/admin/company/company-info.html.twig

@@ -29,6 +29,10 @@
 									{{ form_errors(form) }}
 
 									{{ form_start(form) }}
+									<div class='input-group input-group-outline mb-3 is-filled'>
+										<label for='company_form_vendorId' class='form-label'>DCS Vendor ID</label>
+										<input type='text' name='{{ field_name(form.vendorId) }}' value='{{ field_value(form.vendorId) }}' id='company_form_vendorId' class='form-control' required='required'/>
+									</div>
 									<div class="input-group input-group-outline mb-3 is-filled">
 										<label for="company_form_name" class="form-label">Name</label>
 										<input type="text" name="{{ field_name(form.name) }}" value='{{ field_value(form.name) }}' id='company_form_name' class="form-control" required="required"/>

templates/internal/cases/addresses/list-case-addresses.html.twig

@@ -102,10 +102,6 @@
 									<option value=''>-- Destination --</option>
 								</select>
 							</div>
-							<div class='input-group input-group-outline my-3'>
-								<input type='time' name='arrival' id='arrival'/>
-							</div>
-
 							<div class='input-group input-group-outline my-3'>
 								<input type='checkbox' name='case-mileage' id='case-mileage' value='1'/>
 								<label for='case-mileage' style='padding:5px;'>Case Mileage</label>

templates/internal/cases/members/documents/sign-member-doc.html.twig

@@ -17,26 +17,26 @@
                 }}
             </div>
 
-            <div class='row'>
-                <div class='col'>
-                    <div class='input-group input-group-outline mb-3'>
-                        {% if doc.document.inExtras(enum('App\\Enums\\DocumentExtras').CLIENT_NAME) %}
-                        <input type='text' name='clientName' id='clientName' value='{{ doc.client.name }}'/>
-                        {% endif %}
+            {% if doc.document.inExtras(enum('App\\Enums\\Company\\DocumentExtras').CLIENT_SIGNATURE) %}
+                <div class='row'>
+                    <div class='col'>
+                        <div class='input-group input-group-outline mb-3'>
+                            {% if doc.document.inExtras(enum('App\\Enums\\Company\\DocumentExtras').CLIENT_NAME) %}
+                            <input type='text' name='clientName' id='clientName' value='{{ doc.client.name }}'/>
+                            {% endif %}
 
-                        {% if doc.document.inExtras(enum('App\\Enums\\DocumentExtras').CLIENT_SIGNATURE) %}
-                        <button id='clearClientSignature'>Clear Signature</button><br />
-                        <canvas id='clientSignatureCanvas'></canvas>
-                        {% endif %}
+                            <button id='clearClientSignature'>Clear Signature</button><br />
+                            <canvas id='clientSignatureCanvas'></canvas>
+                        </div>
                     </div>
                 </div>
-            </div>
+            {% endif %}
 
-            {% if doc.document.inExtras(enum('App\\Enums\\DocumentExtras').PROVIDER_SIGNATURE) %}
+            {% if doc.document.inExtras(enum('App\\Enums\\Company\\DocumentExtras').PROVIDER_SIGNATURE) %}
             <div class='row'>
                 <div class='col'>
                     <div class='input-group input-group-outline mb-3'>
-                        {% if doc.document.inExtras(enum('App\\Enums\\DocumentExtras').PROVIDER_NAME) %}
+                        {% if doc.document.inExtras(enum('App\\Enums\\Company\\DocumentExtras').PROVIDER_NAME) %}
                         <input type='text' name='providerName' id='providerName' value='{{ doc.caseWorker.name }}'/>
                         {% endif %}
 
@@ -47,7 +47,8 @@
             </div>
             {% endif %}
 
-            <button type="submit" class="btn btn-primary">Complete</button>
+            <button type="submit" class="btn btn-primary">Complete</button>&nbsp;&nbsp;
+            <button type="button" class="btn btn-secondary" onclick='history.back()'>Back</button>
         </form>
     </div>
 {% endblock %}
@@ -55,7 +56,7 @@
 {% block page_js %}
 		<script src="https://cdn.jsdelivr.net/npm/signature_pad@5.0.4/dist/signature_pad.umd.min.js"></script>
 		<script type='text/javascript'>
-			window.onload = initializeSignatureBlocks;
+window.onload = initializeSignatureBlocks;
 var clientCanvas = document.getElementById('clientSignatureCanvas');
 var providerCanvas = document.getElementById('providerSignatureCanvas');
 var providerSaveSignature = JSON.parse('{{ caseWorkerSignature|raw }}');
@@ -100,10 +101,11 @@ function clearProviderSignature(e) {
 }
 
 function saveSignatureBlock() {
-document.getElementById('signature').value = JSON.stringify(pad.toData());
-
-return true;
+    document.getElementById('signature').value = JSON.stringify(pad.toData());
+    return true;
 }
+
+/** @todo add method to read container div and pass all HTML contents when submitting  */
 		</script>
 {% endblock %}
 

templates/internal/cases/notes/add-standard-note.html.twig

@@ -55,7 +55,7 @@
 									<select name='{{ field_name(form.status) }}' id='note_form_status' class='form-control'>
 										<option value=''>-- Status --</option>
 
-										{% for s in enum('App\\Enums\\NoteStatus').cases() %}
+										{% for s in enum('App\\Enums\\Case\\NoteStatus').cases() %}
 											<option value='{{ s.value }}'>{{ s.value|capitalize }}</option>
 										{% endfor %}
 									</select>
@@ -64,7 +64,7 @@
 									<select name='{{ field_name(form.location) }}' id='note_form_location' class='form-control'>
 										<option value=''>-- Location --</option>
 
-										{% for l in enum('App\\Enums\\NoteLocation').cases() %}
+										{% for l in enum('App\\Enums\\Case\\NoteLocation').cases() %}
 											<option value='{{ l.value }}' {% if l == default_location %} selected='selected' {% endif %}>{{ l.value }}</option>
 										{% endfor %}
 									</select>
@@ -73,7 +73,7 @@
 									<select name='{{ field_name(form.method) }}' id='note_form_method' class='form-control'>
 										<option value=''>-- Method --</option>
 
-										{% for m in enum('App\\Enums\\NoteMethod').cases() %}
+										{% for m in enum('App\\Enums\\Case\\NoteMethod').cases() %}
 											<option value='{{ m.value }}' {% if m == default_method %} selected='selected' {% endif %}>{{ m.name|replace({'_': ' '})|lower|capitalize }}</option>
 										{% endfor %}
 									</select>
@@ -81,11 +81,12 @@
 							</div>
 							<div class='col'>
 								<div class='input-group input-group-outline mb-3'>
-									{{ form_row(form.members, {
-                                        'label': 'Members Present',
-                                        'label_attr': {'class': ''},
-                                        'attr': {'class': 'form-control'}
-                                        }) }}
+									{% for m in members %}
+										<div class='row'>
+											<input type='checkbox' name='{{ field_name(form.members) }}[]' id='visit_note_form_member_{{ loop.index }}' value='{{ m.id }}' class='member-present'/>
+											<label for='visit_note_form_member_{{ loop.index }}'>{{ m.name }}</label>
+										</div>
+									{% endfor %}
 								</div>
 								<div class='input-group input-group-outline mb-3'>
 									<label for='case_note_note' class='form-label'>Notes</label>
@@ -104,4 +105,27 @@
 			</div>
 		</section>
 	</main>
+
+	{{ block('right_bar', 'internal/libs/right-bar.html.twig') }}
+{% endblock %}
+
+{% block page_js %}
+	<script type='module'>
+		import {default as moment} from "{{ asset('vendor/moment/moment.index.js') }}";
+		import {calcTime} from "{{ asset('js/app/notes.js') }}";
+		window.calcTime = calcTime;
+		window.moment = moment;
+	</script>
+{% endblock %}
+
+{% block page_css %}
+	<style type='text/css'>
+		.row>* {
+			width: revert !important;
+			flex-shrink: revert !important;
+		}
+		.member-present {
+			margin-left: var(--bs-gutter-x);
+		}
+	</style>
 {% endblock %}

templates/internal/cases/notes/add-visit-note.html.twig

@@ -55,7 +55,7 @@
 									<select name='{{ field_name(form.status) }}' id='note_form_status' class='form-control'>
 										<option value=''>-- Status --</option>
 
-										{% for s in enum('App\\Enums\\NoteStatus').cases() %}
+										{% for s in enum('App\\Enums\\Case\\NoteStatus').cases() %}
 											<option value='{{ s.value }}'>{{ s.value|capitalize }}</option>
 										{% endfor %}
 									</select>
@@ -64,7 +64,7 @@
 									<select name='{{ field_name(form.location) }}' id='note_form_location' class='form-control'>
 										<option value=''>-- Location --</option>
 
-										{% for l in enum('App\\Enums\\NoteLocation').cases() %}
+										{% for l in enum('App\\Enums\\Case\\NoteLocation').cases() %}
 											<option value='{{ l.value }}' {% if l == default_location %} selected='selected' {% endif %}>{{ l.value }}</option>
 										{% endfor %}
 									</select>
@@ -73,7 +73,7 @@
 									<select name='{{ field_name(form.method) }}' id='note_form_method' class='form-control'>
 										<option value=''>-- Method --</option>
 
-										{% for m in enum('App\\Enums\\NoteMethod').cases() %}
+										{% for m in enum('App\\Enums\\Case\\NoteMethod').cases() %}
 											<option value='{{ m.value }}' {% if m == default_method %} selected='selected' {% endif %}>{{ m.name|replace({'_': ' '})|lower|capitalize }}</option>
 										{% endfor %}
 									</select>
@@ -85,7 +85,7 @@
 									<select name='{{ field_name(form.parentalRole) }}' id='note_form_parentalRole' class='form-control'>
 										<option value=''>-- Select --</option>
 
-										{% for q in enum('App\\Enums\\VisitQualityLevel').cases() %}
+										{% for q in enum('App\\Enums\\Case\\VisitQualityLevel').cases() %}
 											<option value='{{ q.value }}'>{{ q.name|lower|capitalize }}</option>
 										{% endfor %}
 									</select>
@@ -97,7 +97,7 @@
 									<select name='{{ field_name(form.childDevelopment) }}' id='note_form_childDevelopment' class='form-control'>
 										<option value=''>-- Select --</option>
 
-										{% for q in enum('App\\Enums\\VisitQualityLevel').cases() %}
+										{% for q in enum('App\\Enums\\Case\\VisitQualityLevel').cases() %}
 											<option value='{{ q.value }}'>{{ q.name|lower|capitalize }}</option>
 										{% endfor %}
 									</select>
@@ -109,7 +109,7 @@
 									<select name='{{ field_name(form.appropriateResponse) }}' id='note_form_appropriateResponse' class='form-control'>
 										<option value=''>-- Select --</option>
 
-										{% for q in enum('App\\Enums\\VisitQualityLevel').cases() %}
+										{% for q in enum('App\\Enums\\Case\\VisitQualityLevel').cases() %}
 											<option value='{{ q.value }}'>{{ q.name|lower|capitalize }}</option>
 										{% endfor %}
 									</select>
@@ -121,7 +121,7 @@
 									<select name='{{ field_name(form.childAheadOfSelf) }}' id='note_form_childAheadOfSelf' class='form-control'>
 										<option value=''>-- Select --</option>
 
-										{% for q in enum('App\\Enums\\VisitQualityLevel').cases() %}
+										{% for q in enum('App\\Enums\\Case\\VisitQualityLevel').cases() %}
 											<option value='{{ q.value }}'>{{ q.name|lower|capitalize }}</option>
 										{% endfor %}
 									</select>
@@ -133,7 +133,7 @@
 									<select name='{{ field_name(form.showsEmpathy) }}' id='note_form_showsEmpathy' class='form-control'>
 										<option value=''>-- Select --</option>
 
-										{% for q in enum('App\\Enums\\VisitQualityLevel').cases() %}
+										{% for q in enum('App\\Enums\\Case\\VisitQualityLevel').cases() %}
 											<option value='{{ q.value }}'>{{ q.name|lower|capitalize }}</option>
 										{% endfor %}
 									</select>
@@ -145,7 +145,7 @@
 									<select name='{{ field_name(form.childFocused) }}' id='note_form_childFocused' class='form-control'>
 										<option value=''>-- Select --</option>
 
-										{% for q in enum('App\\Enums\\VisitQualityLevel').cases() %}
+										{% for q in enum('App\\Enums\\Case\\VisitQualityLevel').cases() %}
 											<option value='{{ q.value }}'>{{ q.name|lower|capitalize }}</option>
 										{% endfor %}
 									</select>
@@ -153,11 +153,12 @@
 							</div>
 							<div class='col'>
 								<div class='input-group input-group-outline mb-3'>
-									{{ form_row(form.members, {
-                                        'label': 'Members Present',
-                                        'label_attr': {'class': ''},
-                                        'attr': {'class': 'form-control'}
-                                        }) }}
+									{% for m in members %}
+										<div class='row'>
+											<input type='checkbox' name='{{ field_name(form.members) }}[]' id='visit_note_form_member_{{ loop.index }}' value='{{ m.id }}' class='member-present'/>
+											<label for='visit_note_form_member_{{ loop.index }}'>{{ m.name }}</label>
+										</div>
+									{% endfor %}
 								</div>
 								<div class='input-group input-group-outline mb-3'>
 									<label for='note_form_narrative'>Observed Narrative</label>
@@ -189,3 +190,24 @@
 		</section>
 	</main>
 {% endblock %}
+
+{% block page_js %}
+	<script type='module'>
+		import {default as moment} from "{{ asset('vendor/moment/moment.index.js') }}";
+		import {calcTime} from "{{ asset('js/app/notes.js') }}";
+		window.calcTime = calcTime;
+		window.moment = moment;
+	</script>
+{% endblock %}
+
+{% block page_css %}
+	<style type='text/css'>
+		.row>* {
+			width: revert !important;
+			flex-shrink: revert !important;
+		}
+		.member-present {
+			margin-left: var(--bs-gutter-x);
+		}
+	</style>
+{% endblock %}

templates/internal/cases/notes/edit-note.html.twig

@@ -56,8 +56,8 @@
 										<select name='{{ field_name(form.status) }}' id='note_form_status' class='form-control'>
 											<option value=''>-- Status --</option>
 
-											{% for s in enum('App\\Enums\\NoteStatus').cases() %}
-												<option value='{{ s.value }}' {% if s.value == note.status.value %} selected='selected' {% endif %}>{{ s.value|capitalize }}</option>
+											{% for s in enum('App\\Enums\\Case\\NoteStatus').cases() %}
+												<option value='{{ s.value }}' {% if s == note.status %} selected='selected' {% endif %}>{{ s.value|capitalize }}</option>
 											{% endfor %}
 										</select>
 									</div>
@@ -65,8 +65,8 @@
 										<select name='{{ field_name(form.location) }}' id='note_form_location' class='form-control'>
 											<option value=''>-- Location --</option>
 
-											{% for l in enum('App\\Enums\\NoteLocation').cases() %}
-												<option value='{{ l.value }}' {% if l.value == note.location.value %} selected='selected' {% endif %}>{{ l.value }}</option>
+											{% for l in enum('App\\Enums\\Case\\NoteLocation').cases() %}
+												<option value='{{ l.value }}' {% if l == note.location %} selected='selected' {% endif %}>{{ l.value }}</option>
 											{% endfor %}
 										</select>
 									</div>
@@ -74,8 +74,8 @@
 										<select name='{{ field_name(form.method) }}' id='note_form_method' class='form-control'>
 											<option value=''>-- Method --</option>
 
-											{% for m in enum('App\\Enums\\NoteMethod').cases() %}
-												<option value='{{ m.value }}' {% if m.value == note.method.value %} selected='selected' {% endif %}>{{ m.name|replace({'_': ' '})|lower|capitalize }}</option>
+											{% for m in enum('App\\Enums\\Case\\NoteMethod').cases() %}
+												<option value='{{ m.value }}' {% if m == note.method %} selected='selected' {% endif %}>{{ m.name|replace({'_': ' '})|lower|capitalize }}</option>
 											{% endfor %}
 										</select>
 									</div>
@@ -86,8 +86,8 @@
 										<select name='{{ field_name(form.parentalRole) }}' id='note_form_parentalRole' class='form-control'>
 											<option value=''>-- Select --</option>
 
-											{% for q in enum('App\\Enums\\VisitQualityLevel').cases() %}
-												<option value='{{ q.value }}' {% if q.value == note.parentalRole.value %} selected='selected' {% endif %}>{{ q.name|lower|capitalize }}</option>
+											{% for q in enum('App\\Enums\\Case\\VisitQualityLevel').cases() %}
+												<option value='{{ q.value }}' {% if q == note.parentalRole %} selected='selected' {% endif %}>{{ q.name|lower|capitalize }}</option>
 											{% endfor %}
 										</select>
 									</div>
@@ -98,8 +98,8 @@
 										<select name='{{ field_name(form.childDevelopment) }}' id='note_form_childDevelopment' class='form-control'>
 											<option value=''>-- Select --</option>
 
-											{% for q in enum('App\\Enums\\VisitQualityLevel').cases() %}
-												<option value='{{ q.value }}' {% if q.value == note.childDevelopment.value %} selected='selected' {% endif %}>{{ q.name|lower|capitalize }}</option>
+											{% for q in enum('App\\Enums\\Case\\VisitQualityLevel').cases() %}
+												<option value='{{ q.value }}' {% if q == note.childDevelopment %} selected='selected' {% endif %}>{{ q.name|lower|capitalize }}</option>
 											{% endfor %}
 										</select>
 									</div>
@@ -110,8 +110,8 @@
 										<select name='{{ field_name(form.appropriateResponse) }}' id='note_form_appropriateResponse' class='form-control'>
 											<option value=''>-- Select --</option>
 
-											{% for q in enum('App\\Enums\\VisitQualityLevel').cases() %}
-												<option value='{{ q.value }}' {% if q.value == note.appropriateResponse.value %} selected='selected' {% endif %}>{{ q.name|lower|capitalize }}</option>
+											{% for q in enum('App\\Enums\\Case\\VisitQualityLevel').cases() %}
+												<option value='{{ q.value }}' {% if q == note.appropriateResponse %} selected='selected' {% endif %}>{{ q.name|lower|capitalize }}</option>
 											{% endfor %}
 										</select>
 									</div>
@@ -122,8 +122,8 @@
 										<select name='{{ field_name(form.childAheadOfSelf) }}' id='note_form_childAheadOfSelf' class='form-control'>
 											<option value=''>-- Select --</option>
 
-											{% for q in enum('App\\Enums\\VisitQualityLevel').cases() %}
-												<option value='{{ q.value }}' {% if q.value == note.childAheadOfSelf.value %} selected='selected' {% endif %}>{{ q.name|lower|capitalize }}</option>
+											{% for q in enum('App\\Enums\\Case\\VisitQualityLevel').cases() %}
+												<option value='{{ q.value }}' {% if q == note.childAheadOfSelf %} selected='selected' {% endif %}>{{ q.name|lower|capitalize }}</option>
 											{% endfor %}
 										</select>
 									</div>
@@ -134,8 +134,8 @@
 										<select name='{{ field_name(form.showsEmpathy) }}' id='note_form_showsEmpathy' class='form-control'>
 											<option value=''>-- Select --</option>
 
-											{% for q in enum('App\\Enums\\VisitQualityLevel').cases() %}
-												<option value='{{ q.value }}' {% if q.value == note.showsEmpathy.value %} selected='selected' {% endif %}>{{ q.name|lower|capitalize }}</option>
+											{% for q in enum('App\\Enums\\Case\\VisitQualityLevel').cases() %}
+												<option value='{{ q.value }}' {% if q == note.showsEmpathy %} selected='selected' {% endif %}>{{ q.name|lower|capitalize }}</option>
 											{% endfor %}
 										</select>
 									</div>
@@ -146,20 +146,29 @@
 										<select name='{{ field_name(form.childFocused) }}' id='note_form_childFocused' class='form-control'>
 											<option value=''>-- Select --</option>
 
-											{% for q in enum('App\\Enums\\VisitQualityLevel').cases() %}
-												<option value='{{ q.value }}' {% if q.value == note.childFocused.value %} selected='selected' {% endif %}>{{ q.name|lower|capitalize }}</option>
+											{% for q in enum('App\\Enums\\Case\\VisitQualityLevel').cases() %}
+												<option value='{{ q.value }}' {% if q == note.childFocused %} selected='selected' {% endif %}>{{ q.name|lower|capitalize }}</option>
 											{% endfor %}
 										</select>
 									</div>
 								</div>
 								<div class='col'>
 									<div class='input-group input-group-outline mb-3'>
-										{{ form_row(form.members, {
-                                            'label': 'Members Present',
-                                            'label_attr': {'class': ''},
-                                            'attr': {'class': 'form-control'}
-
-                                        }) }}
+										<div>
+											<label>Member Present</label>
+											{% for m in members %}
+												<div class='row'>
+													<input type='checkbox' id='note_form_member_{{ loop.index }}' name='{{ field_name(form.members) }}[]' value='{{ m.id }}' class='member-present' {% if m.isChecked() %} checked='checked' {% endif %}/>
+													<label for='note_form_member_{{ loop.index }}'>{{ m.getName() }}</label>
+												</div>
+											{% endfor %}
+										</div>
+										{# form_row(form.members, {
+											'label': 'Members Present',
+											'label_attr': {'class': ''},
+											'attr': {'class': 'form-control'},
+											'help': 'Select each member present during the time'
+                                        }) #}
 									</div>
 									<div class='input-group input-group-outline mb-3'>
 										<label for='note_form_narrative'>Observed Narrative</label>
@@ -208,11 +217,8 @@
 									{% set endDateWarning = 'bg-gradient-danger text-white' %}
 								{% endif %}
 								<span class='col{% if referral.hours < 40 %} bg-gradient-danger text-white{% endif %}'>
-									Hours:
-									{{ referral.hours }}
-									/
-																										Remaining:
-									{{ referral.getHoursRemaining() }}
+									Hours: {{ referral.hours }} /
+									Remaining: {{ referral.getHoursRemaining() }}
 								</span>
 								<span class='col {{ endDateWarning }}'>
 									Expiration Date:
@@ -239,7 +245,7 @@
 										<select name='{{ field_name(form.status) }}' id='note_form_status' class='form-control'>
 											<option value=''>-- Status --</option>
 
-											{% for s in enum('App\\Enums\\NoteStatus').cases() %}
+											{% for s in enum('App\\Enums\\Case\\NoteStatus').cases() %}
 												<option value='{{ s.value }}'>{{ s.value|capitalize }}</option>
 											{% endfor %}
 										</select>
@@ -248,8 +254,8 @@
 										<select name='{{ field_name(form.location) }}' id='note_form_location' class='form-control'>
 											<option value=''>-- Location --</option>
 
-											{% for l in enum('App\\Enums\\NoteLocation').cases() %}
-												<option value='{{ l.value }}' {% if l == default_location %} selected='selected' {% endif %}>{{ l.value }}</option>
+											{% for l in enum('App\\Enums\\Case\\NoteLocation').cases() %}
+												<option value='{{ l.value }}' {% if l == note.location %} selected='selected' {% endif %}>{{ l.value }}</option>
 											{% endfor %}
 										</select>
 									</div>
@@ -257,19 +263,30 @@
 										<select name='{{ field_name(form.method) }}' id='note_form_method' class='form-control'>
 											<option value=''>-- Method --</option>
 
-											{% for m in enum('App\\Enums\\NoteMethod').cases() %}
-												<option value='{{ m.value }}' {% if m == default_method %} selected='selected' {% endif %}>{{ m.name|replace({'_': ' '})|lower|capitalize }}</option>
+											{% for m in enum('App\\Enums\\Case\\NoteMethod').cases() %}
+												<option value='{{ m.value }}' {% if m == note.method %} selected='selected' {% endif %}>{{ m.name|replace({'_': ' '})|lower|capitalize }}</option>
 											{% endfor %}
 										</select>
 									</div>
 								</div>
 								<div class='col'>
 									<div class='input-group input-group-outline mb-3'>
-										{{ form_row(form.members, {
-                                        'label': 'Members Present',
-                                        'label_attr': {'class': ''},
-                                        'attr': {'class': 'form-control'}
-                                        }) }}
+										<div>
+											<label>Member Present</label>
+											{% for idx,m in members %}
+												<div class='row'>
+													<input type='checkbox' id='note_form_member_{{ idx }}' name='{{ field_name(form.members) }}[]' value='{{ m.id }}' class='member-present' {% if m.isChecked() %} checked='checked' {% endif %}/>
+													<label for='note_form_member_{{ idx }}'>{{ m.name }}</label>
+												</div>
+											{% endfor %}
+										</div>
+										{# form_row(form.members, {
+											'label': 'Members Present',
+											'label_attr': {'class': ''},
+											'attr': {'class': 'form-control'},
+											'help': 'Select each member present during the time',
+											'value': member.id
+                                        }) #}
 									</div>
 									<div class='input-group input-group-outline mb-3'>
 										<label for='case_note_note' class='form-label'>Notes</label>
@@ -283,10 +300,28 @@
 								</div>
 							</div>
 						</div>
-						{{ form_end(form) }}
+						{{ form_end(form, {render_rest: false}) }}
 					</div>
 				</div>
 			</section>
 		{% endif %}
 	</main>
 {% endblock %}
+
+{% block page_js %}
+	<script type='module'>
+		import {* as $} from "{{ asset('vendor/jquery/jquery.index.js') }}";
+	</script>
+{% endblock %}
+
+{% block page_css %}
+	<style>
+		.row>* {
+			width: revert !important;
+			flex-shrink: revert !important;
+		}
+		.member-present {
+			margin-left: var(--bs-gutter-x);
+		}
+	</style>
+{% endblock %}

templates/internal/cases/notes/list-notes.html.twig

@@ -52,19 +52,25 @@
 											<th class="text-uppercase text-secondary text-xxs font-weight-bolder opacity-7">DOS</th>
 											<th class="text-center text-uppercase text-secondary text-xxs font-weight-bolder opacity-7">Location</th>
 											<th class="text-center text-uppercase text-secondary text-xxs font-weight-bolder opacity-7">Method</th>
+											<th class='text-center text-uppercase text-secondary text-xxs font-weight-bolder opacity-7'>Members</th>
 											<th class="text-secondary opacity-7"></th>
 										</tr>
 									</thead>
 									<tbody id='note-list'>
 										{% if caseNotes %}
 											{% for n in caseNotes %}
+												{% set type = 'standard' %}
+												{% if n.referral.serviceCode.value == 'VS-THBB' %}
+													{% set type = 'visit' %}
+												{% endif %}
 												<tr>
 													<td>{{ n.date|date("F j, Y", company_timezone) }}<br/>
-														{{ n.startTime|date("g:i a", company_timezone) }}-{{ n.endTime|date("g:i a", company_timezone) }} ({{ n.calcTimeUsed() }})</td>
+														{{ n.startTime|date("g:i a", company_timezone) }}-{{ n.endTime|date("g:i a", company_timezone) }} ({{ (n.calcTimeUsed() / 60)|number_format(2) }})</td>
 													<td class='text-center'>{{ n.location.value }}</td>
 													<td class='text-center'>{{ n.method.name|lower|replace({"_": " "})|capitalize }}</td>
+													<td class=''>{% for m in n.members %}{{ m.getName() }}, {% endfor %}</td>
 													<td style='text-align: right;'>
-														<a href='/edit-note/{{ n.id }}' class='text-secondary' title='Edit Note'>
+														<a href='{{ path("app_edit_note", {noteType: type, noteId: n.id}) }}' class='text-secondary' title='Edit Note'>
 															<i class="material-symbols-rounded opacity-5">edit</i>
 														</a>
 													</td>

templates/internal/dashboard.html.twig

@@ -10,22 +10,23 @@
 		{{ block('topnav', 'internal/libs/top-nav.html.twig') }}
 
 		<div class='container-fluid py-2'>
-			<div class='row'>
-				<div class='ms-3' style='margin:5px;'>
+			<div class='row' style='margin-right:0;'>
+				<div class='ms-3' style='margin:5px 0;'>
 					<h2 class='mb-0 h4 font-weight-bolder'>Dashboard</h2>
 				</div>
 
-				<div class='col-xl-3 col-sm-6 mb-xl-0 mb-4'>
+				<div class="col-xl-4 col-med-6 col-sm-6 col-12 mb-xl-0 mb-4">
 					<div class='card'>
 						<div class='card-header p-2 ps-3'>
 							<div class='d-flex justify-content-between'>
 								<div>
-									<p class='text-sm mb-0 text-capitalize'>Miles Travelled</p>
+									<p class='text-sm mb-0 text-capitalize'>Total Miles</p>
 									<h4 class='mb-0' title='30 Days / YTD'>
-										{{ milesTravelled30Days }}
-										mi /
-										{{ milesTravelledYTD }}
-										mi
+										{{ milesTravelled30Days }} / {{ milesTravelledYTD }}
+									</h4>
+									<p class='text-sm mb-0 text-capitalize'>Case Miles</p>
+									<h4 class='mb-0' title='30 Days / YTD'>
+                                        {{ caseMileage30Days }} / {{ caseMileageYTD }}
 									</h4>
 								</div>
 								<div class="icon icon-md icon-shape bg-gradient-dark shadow-dark shadow text-center border-radius-lg">
@@ -43,16 +44,16 @@
 						</div>
 					</div>
 				</div>
-				<div class="col-xl-3 col-sm-6 mb-xl-0 mb-4">
+				<div class="col-xl-4 col-med-6 col-sm-6 col-12 mb-xl-0 mb-4">
 					<div class='card'>
 						<div class='card-header p-2 ps-3'>
 							<div class='d-flex justify-content-between'>
 								<div>
 									<p class='text-sm mb-0 text-capitalize'>Time Travelled</p>
 									<h4 class='mb-0'>
-                                        {{ totalTimeTravelled30Days|date("%a %H:%I'%S''") }}
+                                        {{ timeTravelled30Days|date("%a %H:%I'%S''") }}
                                         /
-                                        {{ totalTimeTravelledYTD|date("%a %H:%I'%S''") }}
+                                        {{ timeTravelledYTD|date("%a %H:%I'%S''") }}
                                     </h4>
 								</div>
 								<div class="icon icon-md icon-shape bg-gradient-dark shadow-dark shadow text-center border-radius-lg">
@@ -68,14 +69,14 @@
 						</div>
 					</div>
 				</div>
-				<div class="col-xl-3 col-sm-6 mb-xl-0 mb-4">
+				<div class="col-xl-4 col-med-6 col-sm-6 col-12 mb-xl-0 mb-4">
 					<div class='card'>
 						<div class='card-header p-2 ps-3'>
 							<div class='d-flex justify-content-between'>
 								<div>
-									<p class='text-sm mb-0 text-capitalize'>Case Mileage</p>
+									<p class='text-sm mb-0 text-capitalize'>Billable Hours This Month</p>
 									<h4 class='mb-0'>
-                                        {{ caseMileage30Days }} / {{ caseMileageYTD }}
+                                        {{ (totalBillableHours30Days / 60) | number_format(2)  }}
                                     </h4>
 								</div>
 								<div class="icon icon-md icon-shape bg-gradient-dark shadow-dark shadow text-center border-radius-lg">
@@ -86,18 +87,24 @@
 						<hr class='dark horizontal my-0'>
 						<div class='card-footer p-2 ps-3'>
 							<p class='mb-0 text-sm'>
-								<span class='text-info font-weight-bolder' title='30 Days / YTD'></span>
+								<span class='text-info font-weight-bolder' title='30 Days / YTD'>
+									{% for key, value in billableHours30Days %}
+										{{ key }} : {{ (value / 60) | number_format(2) }}<br />
+									{% endfor %}
+								</span>
 							</p>
 						</div>
 					</div>
 				</div>
-				<div class="col-xl-3 col-sm-6 mb-xl-0 mb-4">
+				<div class="col-xl-4 col-med-6 col-sm-6 col-12 mb-xl-0 mb-4">
 					<div class='card'>
 						<div class='card-header p-2 ps-3'>
 							<div class='d-flex justify-content-between'>
 								<div>
-									<h4 class='mb-0'>Miles Travelled</h4>
-									<p class='text-sm mb-0 text-capitalize'></p>
+									<p class='text-sm mb-0 text-capitalize'>Billable Hours YTD</p>
+									<h4 class='mb-0'>
+                                        {{ (totalBillableHoursYTD / 60) | number_format(2)  }}
+                                    </h4>
 								</div>
 								<div class="icon icon-md icon-shape bg-gradient-dark shadow-dark shadow text-center border-radius-lg">
 									<i class="material-symbols-rounded opacity-10">weekend</i>
@@ -107,10 +114,11 @@
 						<hr class='dark horizontal my-0'>
 						<div class='card-footer p-2 ps-3'>
 							<p class='mb-0 text-sm'>
-								<span class='text-info font-weight-bolder' title='30 Days / YTD'>{{ milesTravelled30Days }}
-									mi /
-									{{ milesTravelledYTD }}
-									mi</span>
+								<span class='text-info font-weight-bolder' title='30 Days / YTD'>
+									{% for key, value in billableHoursYTD %}
+										{{ key }} : {{ value / 60 }}<br/>
+									{% endfor %}
+								</span>
 							</p>
 						</div>
 					</div>
@@ -118,21 +126,20 @@
 			</div>
 
 			<div class='row'>
-				<div class="col-lg-4 col-md-6 mt-4 mb-4">
+				<div class="col-xl-6 col-lg-8 col-md-8 mt-4 mb-4">
 					<div class="card">
 						<div class="card-body">
-							<h6 class="mb-0 ">Website Views</h6>
-							<p class="text-sm ">Last Campaign Performance</p>
+							<h6 class="mb-0 ">Billable Hours</h6>
+							<p class="text-sm ">Rolling 6 Months</p>
 							<div class="pe-2">
 								<div class="chart">
-									<canvas id="chart-bars" class="chart-canvas" height="170"></canvas>
+									<canvas id="chart-billable-hours-6-months" class="chart-canvas" height="170"></canvas>
 								</div>
 							</div>
 							<hr class="dark horizontal">
 							<div class="d-flex ">
-								<i class="material-symbols-rounded text-sm my-auto me-1">schedule</i>
+								<i class="material-symbols-rounded text-sm my-auto me-1"></i>
 								<p class="mb-0 text-sm">
-									campaign sent 2 days ago
 								</p>
 							</div>
 						</div>
@@ -142,3 +149,37 @@
 		</div>
 	</main>
 {% endblock %}
+
+{% block page_js %}
+	<script type='text/javascript' src="{{ asset('js/plugins/chartjs.min.js') }}"></script>
+	<script type='module'>
+		//import {default as Chart} from "{{ asset('vendor/chartjs/chartjs.index.js') }}";
+		window.onload = initCharts;
+		//window.Chart = Chart;
+	</script>
+	<script type='text/javascript'>
+function initCharts() {
+	var ctx = document.getElementById("chart-billable-hours-6-months").getContext("2d");
+	var myChart = new Chart(ctx, {
+		type: 'line',
+		data: {
+			labels: ["1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12"],
+			datasets: [{
+				label: "Hours",
+				tension: 0,
+				borderWidth: 2,
+				pointRadius: 3,
+				pointBackgroundColor: "#43A047",
+				pointBorderColor: "transparent",
+				borderColor: "#43A047",
+				backgroundColor: "transparent",
+				fill: true,
+				data: {"1": [2]},
+				maxBarThickness: 6
+			}],
+		},
+		options: {{ options|json_encode|raw }}
+	});
+}
+	</script>
+{% endblock %}

templates/internal/libs/top-nav.html.twig

@@ -29,13 +29,12 @@
 							</div>
 						</a>
 					</li>
-					{% if is_granted('ROLE_ADMIN') %}
-						<li class="nav-item px-3 d-flex align-items-center" title="Site Settings">
-							<a href="javascript:;" class="nav-link text-body p-0">
-								<i class="material-symbols-rounded fixed-plugin-button-nav">settings</i>
-							</a>
-						</li>
-					{% endif %}
+					<li class="nav-item px-3 d-flex align-items-center" title="Site Settings">
+						<a href="javascript:;" class="nav-link text-body p-0">
+							<i class="material-symbols-rounded fixed-plugin-button-nav">settings</i>
+						</a>
+					</li>
+
 					<li class="nav-item dropdown pe-3 d-flex align-items-center" title="Notifications">
 						<a href="javascript:;" class="nav-link text-body p-0 notification" id="dropdownMenuButton" data-bs-toggle="dropdown" aria-expanded="false">
 							<i class="material-symbols-rounded">notifications</i>
@@ -50,25 +49,25 @@
 												{% if note.sender.imageName %}<img src='{{ user_image_path }}/{{ note.sender.imageName }}' class='avatar avatar-sm me-3'><br/>
 												{% endif %}
 												<i class='material-symbols-rounded opacity-7'>
-													{% if note.type == enum('App\\Enums\\MessageType').CASE %}
+													{% if note.type == enum('App\\Enums\\System\\MessageType').CASE %}
 														cases
-													{% elseif note.type == enum('App\\Enums\\MessageType').STAFFING %}
+													{% elseif note.type == enum('App\\Enums\\System\\MessageType').STAFFING %}
 														person
-													{% elseif note.type == enum('App\\Enums\\MessageType').GENERAL %}
+													{% elseif note.type == enum('App\\Enums\\System\\MessageType').GENERAL %}
 														chat_bubble
-                                                    {% elseif note.type == enum('App\\Enums\\MessageType').BILLING %}
+                                                    {% elseif note.type == enum('App\\Enums\\System\\MessageType').BILLING %}
                                                         local_atm
-                                                    {% elseif note.type == enum('App\\Enums\\MessageType').NEW_CASE %}
+                                                    {% elseif note.type == enum('App\\Enums\\System\\MessageType').NEW_CASE %}
                                                         business_center
-                                                    {% elseif note.type == enum('App\\Enums\\MessageType').USER %}
+                                                    {% elseif note.type == enum('App\\Enums\\System\\MessageType').USER %}
                                                         person_add
-                                                    {% elseif note.type == enum('App\\Enums\\MessageType').NEW_REFERRAL %}
+                                                    {% elseif note.type == enum('App\\Enums\\System\\MessageType').NEW_REFERRAL %}
                                                         add_to_queue
-                                                    {% elseif note.type == enum('App\\Enums\\MessageType').STAFF_NOTE %}
+                                                    {% elseif note.type == enum('App\\Enums\\System\\MessageType').STAFF_NOTE %}
                                                         add_notes
-                                                    {% elseif note.type == enum('App\\Enums\\MessageType').CALENDAR %}
+                                                    {% elseif note.type == enum('App\\Enums\\System\\MessageType').CALENDAR %}
                                                         calendar_month
-                                                    {% elseif note.type == enum('App\\Enums\\MessageType').REMINDER %}
+                                                    {% elseif note.type == enum('App\\Enums\\System\\MessageType').REMINDER %}
                                                         notifications
 													{% endif %}
 												</i>
@@ -92,7 +91,11 @@
 					</li>
 					<li class="nav-item d-flex align-items-center" title="Profile">
 						<a href="{{ path('app_profile') }}" class="nav-link text-body font-weight-bold px-0">
-							<i class="material-symbols-rounded">account_circle</i>
+							{% if app.user and app.user.imageName %}
+								<img class='small-profile-image' src='{% if app.user.imageName %}{{ user_image_path }}/{{ app.user.imageName }}{% endif %}'/>
+							{% else %}
+								<i class="material-symbols-rounded">account_circle</i>
+							{% endif %}
 						</a>
 					</li>
 				</ul>

templates/internal/staff/cases/my-cases.html.twig

@@ -18,7 +18,18 @@
 					</p>
 				</div>
 				{% for c in cases %}
-					<div class='col-xl-3 col-sm-6 mb-xl-0 mb-4'>
+					{% set latestNote = c.getStaffNotes()[0] %}
+					{% set status = '#ff0000' %}
+					{% set symbol = 'cancel' %}
+					{% if latestNote.getWorkerSignDatetime() %}
+						{% set status = '#00ff00' %}
+						{% set symbol = 'check_circle' %}
+					{% elseif latestNote.getSupervisorSignDateTime() %}
+						{% set status = '#ffff00' %}
+						{% set symbol = 'warning' %}
+					{% endif %}
+
+					<div class='col-xl-4 col-med-6 col-sm-6 col-12 mb-xl-0 mb-4'>
 						<div class='card'>
 							<div class='card-header p-2 ps-3'>
 								<div class='d-flex justify-content-between'>
@@ -38,6 +49,9 @@
 								<p class='mb-0 text-sm'>
 									<span class='text-info font-weight-bolder'>
 										<a href='{{ path('app_staff_list_notes', {staffId: user.id, caseId: c.id}) }}'>Staff Notes</a>
+										<span class='material-symbols-rounded opacity-7' style='color:{{ status }}' title='Last Note: {{ latestNote.date|date('M j, Y') }}'>
+											{{ symbol }}
+										</span>
 									</span>
 								</p>
 							</div>

templates/internal/staff/cases/staff-cases.html.twig

@@ -12,6 +12,16 @@
 					<p class='mb-4'></p>
 				</div>
 				{% for c in cases %}
+					{% set latestNote = c.getStaffNotes()[0] %}
+					{% set status = '#ff0000' %}
+					{% set symbol = 'cancel' %}
+					{% if latestNote.getWorkerSignDatetime() %}
+						{% set status = '#00ff00' %}
+						{% set symbol = 'check_circle' %}
+					{% elseif latestNote.getSupervisorSignDateTime() %}
+						{% set status = '#ffff00' %}
+						{% set symbol = 'warning' %}
+					{% endif %}
 					<div class='col-xl-3 col-sm-6 mb-xl-0 mb-4'>
 						<div class='card'>
 							<div class='card-header p-2 ps-3'>
@@ -29,9 +39,16 @@
 							</div>
 							<hr class='dark horizontal my-0'>
 							<div class='card-footer p-2 ps-3'>
+								<p class='mb-0 text-sm'>
+									<span class='text-info' style='color:{{ status }} !important;'>
+									</span>
+								</p>
 								<p class='mb-0 text-sm'>
 									<span class='text-info font-weight-bolder'>
 										<a href='{{ path('app_staff_list_notes', {staffId: staffId, caseId: c.id}) }}'>Staff Notes</a>
+										<span class='material-symbols-rounded opacity-7' style='color:{{ status }}' title='Last Note: {{ latestNote.date|date('M j, Y') }}'>
+											{{ symbol }}
+										</span>
 									</span>
 								</p>
 							</div>

templates/internal/staff/staff-dashboard.html.twig

@@ -12,19 +12,20 @@
 					<p class='mb-4'></p>
 				</div>
 				{% for s in staff %}
-					<div class='col-xl-3 col-sm-6 mb-xl-0 mb-4'>
+					<div class='col-xl-4 col-med-6 col-sm-6 col-12 mb-xl-0 mb-4'>
 						<div class='card'>
 							<div class='card-header p-2 ps-3'>
 								<div class='d-flex justify-content-between'>
 									<div>
 										<h4 class='mb-0'>{{ s.name }}</h4>
 										<p class='text-sm mb-0 text-capitalize'>
-                                            <a href='mailto:{{ s.email }}'>{{ s.email }}</a><br />
-											{% if s.workPhone %}<a href='tel:{{ s.workPhone }}'>{{ s.getFormattedPhone() }}</a>{% endif %}
+                                            {% if s.workPhone %}<a href='tel:{{ s.workPhone }}'>{{ s.getFormattedPhone() }}</a>{% endif %}
 										</p>
 									</div>
 									<div class="icon icon-md icon-shape bg-gradient-dark shadow-dark shadow text-center border-radius-lg">
-										<i class="material-symbols-rounded opacity-10">weekend</i>
+										<a href='mailto:{{ s.email }}'>
+											<i class="material-symbols-rounded opacity-10">weekend</i>
+										</a>
 									</div>
 								</div>
 							</div>

templates/libs/nav.html.twig

@@ -5,13 +5,6 @@
 			<a class="navbar-brand font-weight-bolder ms-lg-0 ms-3 " href="{{ path('app_dashboard') }}">
 				CM Tracker
 			</a>
-			<button class="navbar-toggler shadow-none ms-2" type="button" data-bs-toggle="collapse" data-bs-target="#navigation" aria-controls="navigation" aria-expanded="false" aria-label="Toggle navigation">
-				<span class="navbar-toggler-icon mt-2">
-					<span class="navbar-toggler-bar bar1"></span>
-					<span class="navbar-toggler-bar bar2"></span>
-					<span class="navbar-toggler-bar bar3"></span>
-				</span>
-			</button>
 			<div class="collapse navbar-collapse" id="navigation">
 				<ul
 					class="navbar-nav mx-auto">

templates/registration/register-step-company.html.twig

@@ -29,6 +29,10 @@
 									{{ form_errors(form) }}
 
 									{{ form_start(form) }}
+									<div class='input-group input-group-outline mb-3'>
+										<label for='registration_form_vendorId' class='form-label'>DCS Vendor ID</label>
+										<input type='text' name='{{ field_name(form.vendorId) }}' placeholder='' class='form-control' required='required'/>
+									</div>
 									<div class="input-group input-group-outline mb-3">
 										<label for="registration_form_name" class="form-label">Name</label>
 										<input type="text" name="{{ field_name(form.name) }}" placeholder="" class="form-control" required="required"/>