rework display - rebuild all - added script for building all

This commit is contained in:
Frede Hundewadt 2023-12-02 14:58:33 +01:00
parent b150b3679d
commit a03d23192a
5 changed files with 27 additions and 21 deletions

View file

@ -41,7 +41,7 @@
<tfoot> <tfoot>
<tr> <tr>
<td colspan="6" class="text-end">SAS</td> <td colspan="6" class="text-end">SAS</td>
<td class="text-end">@ReportItem.SasAmount</td> <td class="text-end fw-bold">@ReportItem.SasAmount</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
@ -51,7 +51,7 @@
</tr> </tr>
<tr> <tr>
<td colspan="6" class="text-end">TOTAL</td> <td colspan="6" class="text-end">TOTAL</td>
<td class="text-end">@(ReportItem.OrderAmount + ReportItem.SasAmount)</td> <td class="text-end fw-bold">@(ReportItem.OrderAmount + ReportItem.SasAmount)</td>
<td></td> <td></td>
</tr> </tr>
</tfoot> </tfoot>

View file

@ -25,7 +25,7 @@
<th scope="col">Salg</th> <th scope="col">Salg</th>
<th scope="col">Note</th> <th scope="col">Note</th>
<th scope="col" class="text-end">SAS</th> <th scope="col" class="text-end">SAS</th>
<th scope="col" class="text-end">NORMAL</th> <th scope="col" class="text-end">Salg</th>
<th scope="col" class="text-center"><i class="bi-phone"></i></th> <th scope="col" class="text-center"><i class="bi-phone"></i></th>
<th scope="col" class="text-center"><i class="bi-lightning-charge"></i></th> <th scope="col" class="text-center"><i class="bi-lightning-charge"></i></th>
<th scope="col" class="text-center"><i class="bi-calculator"></i></th> <th scope="col" class="text-center"><i class="bi-calculator"></i></th>
@ -73,14 +73,14 @@
</tbody> </tbody>
<tfoot> <tfoot>
<tr> <tr>
<td colspan="6"></td> <td colspan="6" class="text-end"></td>
<td class="text-end">@(Activities.Sum(x => x.SasAmount))</td> <td class="text-end fw-bold">@(Activities.Sum(x => x.SasAmount))</td>
<td class="text-end">@(Activities.Sum(x => x.OrderAmount))</td> <td class="text-end fw-bold">@(Activities.Sum(x => x.OrderAmount))</td>
<td colspan="4"></td> <td colspan="4"></td>
</tr> </tr>
<tr> <tr>
<td colspan="7" class="text-end">TOTAL</td> <td colspan="7" class="text-end">TOTAL</td>
<td class="text-end">@(Activities.Sum(x => x.SasAmount) + Activities.Sum(x => x.OrderAmount))</td> <td class="text-end fw-bold">@(Activities.Sum(x => x.SasAmount) + Activities.Sum(x => x.OrderAmount))</td>
<td colspan="4"></td> <td colspan="4"></td>
</tr> </tr>
</tfoot> </tfoot>

View file

@ -23,7 +23,7 @@
<tr class="border-bottom inno-thead"> <tr class="border-bottom inno-thead">
<th></th> <th></th>
<th class="text-center" colspan="2" scope="col">Demo: @(ReportData.NewDemoCount + ReportData.RecallDemoCount)</th> <th class="text-center" colspan="2" scope="col">Demo: @(ReportData.NewDemoCount + ReportData.RecallDemoCount)</th>
<th class="text-center border-end" colspan="2" scope="col">Resultat</th> <th class="text-center border-end" colspan="2" scope="col">Dagens Resultat</th>
<th class="text-center" colspan="4" scope="col">Måneds Resultat</th> <th class="text-center" colspan="4" scope="col">Måneds Resultat</th>
</tr> </tr>
<tr class="border-bottom"> <tr class="border-bottom">
@ -65,7 +65,7 @@
</tr> </tr>
@* PHONE row *@ @* PHONE row *@
<tr> <tr>
<th scope="row">TLF</th> <th scope="row">Tlf</th>
<td></td> <td></td>
<td></td> <td></td>
<td class="text-end">@ReportData.PhoneCount</td> <td class="text-end">@ReportData.PhoneCount</td>
@ -77,7 +77,7 @@
</tr> </tr>
@* WEB row *@ @* WEB row *@
<tr> <tr>
<th scope="row">WEB</th> <th scope="row">Web</th>
<td></td> <td></td>
<td></td> <td></td>
<td class="text-end">@ReportData.WebCount</td> <td class="text-end">@ReportData.WebCount</td>
@ -89,7 +89,7 @@
</tr> </tr>
@* SUMMARY row *@ @* SUMMARY row *@
<tr> <tr>
<th scope="row">SALG</th> <th scope="row">Salg u/SAS</th>
<td class="text-end">@ReportData.TotalVisitCount</td> <td class="text-end">@ReportData.TotalVisitCount</td>
<td class="text-end">@ReportData.TotalDemoCount</td> <td class="text-end">@ReportData.TotalDemoCount</td>
<td class="text-end">@ReportData.TotalSaleCount</td> <td class="text-end">@ReportData.TotalSaleCount</td>
@ -112,15 +112,10 @@
<td class="text-end fw-bold">@ReportData.SasTurnoverMonth</td> <td class="text-end fw-bold">@ReportData.SasTurnoverMonth</td>
</tr> </tr>
@* TOTAL summarry row *@ @* TOTAL summarry row *@
<tr> <tr class="border-top border-2">
<th>SUM</th> <th scope="row" colspan="4" class="text-end">Dagens oms.</th>
<td></td>
<td></td>
<td></td>
<td class="text-end border-end">@ReportData.TotalTurnover</td> <td class="text-end border-end">@ReportData.TotalTurnover</td>
<td></td> <th scope="row" colspan="3" class="text-end">Måneds oms.</th>
<td></td>
<td></td>
<td class="text-end">@ReportData.TotalTurnoverMonth</td> <td class="text-end">@ReportData.TotalTurnoverMonth</td>
</tr> </tr>
</tbody> </tbody>

View file

@ -1,8 +1,8 @@
{ {
"appInfo": { "appInfo": {
"name": "Wonky Online", "name": "Wonky Online",
"version": "314.0", "version": "315.0",
"rc": true, "rc": false,
"sandBox": true, "sandBox": true,
"image": "grumpy-coder.png", "image": "grumpy-coder.png",
"sdk": "dotnet 8.0" "sdk": "dotnet 8.0"

11
build-all.sh Executable file
View file

@ -0,0 +1,11 @@
#!/usr/bin/env bash
if [[ -z $1 ]]; then
echo "no version"
exit 1
fi
./alfa-build.sh $1
./edu-build.sh $1
./next-build.sh $1
./prod-build.sh $1