Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/psr_table'
Browse files Browse the repository at this point in the history
  • Loading branch information
@rmaffitsancsoft
rmaffitsancsoft committed Apr 30, 2024
2 parents a31a000 + 21272f5 commit def14cc
Show file tree
Hide file tree
Showing 2 changed files with 133 additions and 0 deletions.
122 changes: 122 additions & 0 deletions src/angular/hq/src/app/psr/psr.component.html
View file
Original file line number Diff line number Diff line change
@@ -1 +1,123 @@
<router-outlet></router-outlet>

<table class="min-w-full border-spacing-0 border-separate">
<thead>
<tr class="sticky top-0 text-left">
<th scope="col" colspan="2" class="bg-blue-900 border-steel-blue-600 border-y py-3 pl-5">% Billable</th>
<th scope="col" class="bg-blue-900 border-steel-blue-600 border-y py-3">Hrs</th>
<th scope="col" class="bg-blue-900 border-steel-blue-600 border-y py-3">Date</th>
<th scope="col" class="bg-blue-900 border-steel-blue-600 border-y py-3">Chrg Code</th>
<th scope="col" class="bg-blue-900 border-steel-blue-600 border-y py-3">Staff</th>
<th scope="col" class="bg-blue-900 border-steel-blue-600 border-y py-3">Activity/Task</th>
<th scope="col" colspan="2" class="bg-blue-900 border-steel-blue-600 border-y py-3">
<div class="flex items-center justify-between">
Description
<div class="flex space-x-2 pr-5">
<button class="px-2 py-2 bg-transparent border border-orange-500 hover:bg-orange-600 hover:border-orange-600 text-white rounded-[2px] min-w-[120px] font-normal">Accept All</button>
<button class="px-2 py-2 border border-orange-500 bg-orange-500 hover:bg-orange-600 hover:border-orange-600 text-white rounded-[2px] min-w-[120px] font-normal">Accept</button>
</div>
</div>
</th>
</tr>
</thead>
<tbody>
<!-- Accepted -->
<tr class="even:bg-gray-850 odd:bg-black-alt text-gray-450">
<td class="border-b border-black py-2 bg-green-600 w-3"></td>
<td class="border-b border-black py-2 pl-3">
<div class="w-11 inline-block text-right py-1 px-2 mr-2">100</div>
<span>%</span>
</td>
<td class="border-b border-black py-2">2.25</td>
<td class="border-b border-black py-2">3/23/2024</td>
<td class="border-b border-black py-2">P1006</td>
<td class="border-b border-black py-2">rlennox</td>
<td class="border-b border-black py-2">Support</td>
<td class="border-b border-black py-2">
<div class="flex space-x-2">
<div class="inline-block w-full py-1 px-2 mr-2">Phil reported transactions werent posting to the cmp. Found an issue with the payment record create statement, posted a fix.</div>
<!-- warning icon -->
<div></div>

</div>
</td>
<td class="border-b border-black py-2 text-right pr-5">
<a href="#" class="text-teal-200 hover:text-teal-300 uppercase">edit</a>
</td>
</tr>
<!-- Needs Attention -->
<tr class="even:bg-gray-850 odd:bg-black-alt">
<td class="border-b border-black py-2 bg-yellow-550 w-3"></td>
<td class="border-b border-black py-2 pl-3">
<input class="w-11 bg-blue-900 border border-black rounded py-1 px-2 mr-2 text-right" value="80">
<span>%</span>
</td>
<td class="border-b border-black py-2">2.25</td>
<td class="border-b border-black py-2">3/23/2024</td>
<td class="border-b border-black py-2">P1006</td>
<td class="border-b border-black py-2">rlennox</td>
<td class="border-b border-black py-2">Support</td>
<td class="border-b border-black py-2">
<div class="flex space-x-2">
<input class="w-full bg-blue-900 border border-black rounded py-1 px-2 mr-2" value="Testing bug fixes for mqtt site controller, updated environments.">
<!-- warning icon -->
<div></div>

</div>
</td>
<td class="border-b border-black py-2 text-right pr-5">
<a href="#" class="text-teal-200 hover:text-teal-300 uppercase">accept</a>
</td>
</tr>
<!-- Default -->
<tr class="even:bg-gray-850 odd:bg-black-alt">
<td class="border-b border-black py-2 bg-gray-450 w-3"></td>
<td class="border-b border-black py-2 pl-3">
<input class="w-11 bg-blue-900 border border-black rounded py-1 px-2 mr-2 text-right" value="80">
<span>%</span>
</td>
<td class="border-b border-black py-2">2.25</td>
<td class="border-b border-black py-2">3/23/2024</td>
<td class="border-b border-black py-2">P1006</td>
<td class="border-b border-black py-2">rlennox</td>
<td class="border-b border-black py-2">Support</td>
<td class="border-b border-black py-2">
<div class="flex space-x-2">
<input class="w-full bg-blue-900 border border-black rounded py-1 px-2 mr-2" value="PAX design review">
<!-- warning icon -->
<div></div>
</div>
</td>
<td class="border-b border-black py-2 text-right pr-5">
<div class="divide-x divide-teal-200">
<button class="text-teal-200 hover:text-teal-300 uppercase pr-3">reject</button>
<button class="text-teal-200 hover:text-teal-300 uppercase pl-3">accept</button>
</div>
</td>
</tr>
<!-- Error -->
<tr class="even:bg-gray-850 odd:bg-black-alt">
<td class="border-b border-black py-2 bg-red-850 w-3"></td>
<td class="border-b border-black py-2 pl-3">
<input class="w-11 bg-blue-900 border border-black rounded py-1 px-2 mr-2 text-right" value="80">
<span>%</span>
</td>
<td class="border-b border-black py-2">2.25</td>
<td class="border-b border-black py-2">3/23/2024</td>
<td class="border-b border-black py-2">P1006</td>
<td class="border-b border-black py-2">rlennox</td>
<td class="border-b border-black py-2">Support</td>
<td class="border-b border-black py-2">
<div class="flex space-x-2">
<div class="w-full py-1 px-2 mr-2">Assisting Jack with debugging NV200 issues, sealevel questions.</div>
<!-- warning icon -->
<div></div>

</div>
</td>
<td class="border-b border-black py-2 text-right pr-5">
<button disabled class="text-gray-450 uppercase">accept</button>
</td>
</tr>
</tbody>
</table>
11 changes: 11 additions & 0 deletions src/angular/hq/tailwind.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ module.exports = {
'xs': '10px'
},
spacing: {
'3': '15px',
'4': '20px',
'5': '30px',
},
Expand Down Expand Up @@ -77,6 +78,7 @@ module.exports = {
'200': '#d1d1d1',
'300': '#b0b0b0',
'400': '#888888',
'450': '#808080',
'500': '#6d6d6d',
'600': '#5d5d5d',
'700': '#4f4f4f',
Expand All @@ -91,6 +93,15 @@ module.exports = {
'200': '#B2EDF1',
'300': '#7adde6',
},
red: {
'850': "#852420",
},
yellow: {
'550': "#CBC34E",
},
green: {
'450': "#33B578",
},
}
},
},
Expand Down

0 comments on commit def14cc

Please sign in to comment.