From 4113a2819d5bbb50c141393414fa9d0d03073edc Mon Sep 17 00:00:00 2001
From: Jonathan Bobel <jonathan.bobel@gsa.gov>
Date: Wed, 17 Jul 2024 12:18:05 -0400
Subject: [PATCH] Merged dashboard.html

---
 app/templates/views/dashboard/dashboard.html | 39 +++++++++++++++-----
 poetry.lock                                  |  1 -
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/app/templates/views/dashboard/dashboard.html b/app/templates/views/dashboard/dashboard.html
index abd127f57..2cbde843f 100644
--- a/app/templates/views/dashboard/dashboard.html
+++ b/app/templates/views/dashboard/dashboard.html
@@ -9,7 +9,7 @@
 
 {% block maincolumn_content %}
 
-  <div class="dashboard margin-bottom-8">
+  <div class="dashboard margin-bottom-2">
 
     <h1 class="usa-sr-only">Dashboard</h1>
     {% if current_user.has_permissions('manage_templates') and not current_service.all_templates %}
@@ -18,22 +18,27 @@
 
     {{ ajax_block(partials, updates_url, 'upcoming') }}
 
-    <!-- <canvas id="myChart" data-service-id="{{ service_id }}"></canvas> -->
-
     <h2 class="font-body-2xl margin-top-0">{{ current_service.name }} Dashboard</h2>
 
-    <h2 class="line-height-sans-2 margin-bottom-0 margin-top-4">
-      Messages sent
-    </h2>
-
     {{ ajax_block(partials, updates_url, 'inbox') }}
 
-    {{ ajax_block(partials, updates_url, 'totals') }}
+    <!-- {{ ajax_block(partials, updates_url, 'totals') }} -->
+
+    <div id="totalMessageChartContainer" data-sms-sent="{{ sms_sent }}" data-sms-allowance-remaining="{{ sms_allowance_remaining }}">
+      <h2 id="chartTitle">Total Messages</h2>
+      <svg id="totalMessageChart"></svg>
+      <div id="message"></div>
+    </div>
+    <div id="totalMessageTable" class="margin-0"></div>
+    <p class="align-with-heading-copy margin-bottom-4">
+      What counts as 1 text message part?<br />
+      See <a class="usa-link" href="{{ url_for('.pricing') }}">Tracking usage</a>.
+    </p>
 
     <h2 class="line-height-sans-2 margin-bottom-0 margin-top-4">
       Activity snapshot
     </h2>
-    <div id="chartsArea">
+    <div id="activityChartContainer">
       <form class="usa-form">
         <label class="usa-label" for="options">Account</label>
         <select class="usa-select margin-bottom-2" name="options" id="options">
@@ -42,7 +47,7 @@
           <option value="individual">{{ current_user.name }}</option>
         </select>
       </form>
-      <div id="Weekly">
+      <div id="activityChart">
         <div class="chart-header">
           <div class="chart-subtitle">{{ current_service.name }} - Last 7 Days</div>
           <div class="chart-legend" aria-label="Legend"></div>
@@ -54,6 +59,8 @@
     <div id="message"></div>
     <div id="aria-live-account" class="usa-sr-only" aria-live="polite"></div>
 
+    {% if current_user.has_permissions('manage_service') %}{% endif %}
+
     <h2 class="margin-top-4">Recent Batches</h2>
     <div class="table-wrapper">
       <table class="usa-table job-table margin-top-0">
@@ -124,5 +131,17 @@
 
     <h2>Recent templates</h2>
     {{ ajax_block(partials, updates_url, 'template-statistics') }}
+    {#  <h2 class="margin-top-4 margin-bottom-1">Message count</h2>
+    {% if current_user.has_permissions('manage_service') %}
+      <h3 class='margin-bottom-0' id="current-year"></h3>
+      {{ ajax_block(partials, updates_url, 'usage') }}
+      <p class="margin-top-0">During the pilot period, each service has an allowance of 250,000 message parts. Once this allowance is met, the
+      application will stop delivering messages. There's no monthly charge, no setup fee, and no procurement cost.</p>
+      <p class="align-with-heading-copy">
+        What counts as 1 text message part?<br />
+        See <a class="usa-link" href="{{ url_for('.pricing') }}">pricing</a>.
+      </p>
+    {% endif %} #}
+  </div>
 
 {% endblock %}
diff --git a/poetry.lock b/poetry.lock
index 14de12290..9ef6a8718 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1685,7 +1685,6 @@ files = [
     {file = "msgpack-1.0.8-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5fbb160554e319f7b22ecf530a80a3ff496d38e8e07ae763b9e82fadfe96f273"},
     {file = "msgpack-1.0.8-cp39-cp39-win32.whl", hash = "sha256:f9af38a89b6a5c04b7d18c492c8ccf2aee7048aff1ce8437c4683bb5a1df893d"},
     {file = "msgpack-1.0.8-cp39-cp39-win_amd64.whl", hash = "sha256:ed59dd52075f8fc91da6053b12e8c89e37aa043f8986efd89e61fae69dc1b011"},
-    {file = "msgpack-1.0.8-py3-none-any.whl", hash = "sha256:24f727df1e20b9876fa6e95f840a2a2651e34c0ad147676356f4bf5fbb0206ca"},
     {file = "msgpack-1.0.8.tar.gz", hash = "sha256:95c02b0e27e706e48d0e5426d1710ca78e0f0628d6e89d5b5a5b91a5f12274f3"},
 ]