Fakultas Ilmu Komputer UI

Commit 482b2a5b authored by WILLIAM GATES's avatar WILLIAM GATES
Browse files

Merge branch 'staging' into 'master'

Minor Changes

See merge request !51
parents 0b8803c7 cabefd71
Pipeline #49845 passed with stages
in 13 minutes and 9 seconds
......@@ -107,14 +107,14 @@ Key | Required | Example
```bash
$ python3 manage.py createorupdateapiconfig
```
- Run server
```bash
$ python3 manage.py runserver
```
- Create Superuser
```bash
$ python3 manage.py createsuperuser
```
- Run server
```bash
$ python3 manage.py runserver
```
## Deployed API URLs
......
......@@ -102,22 +102,22 @@ class DonationReuploadProofOfBankTransferSerializer(serializers.Serializer): # p
class ReportTransactionSerializer(serializers.Serializer): # pylint: disable=abstract-method
created_at_date_range_after = serializers.DateField(
label=_('Created after date'),
label=_('Created from date'),
required=False
)
created_at_date_range_before = serializers.DateField(
label=_('Created before date'),
label=_('Created to date'),
required=False
)
class ReportProgramDonationSerializer(serializers.Serializer): # pylint: disable=abstract-method
created_at_date_range_after = serializers.DateField(
label=_('Created after date'),
label=_('Created from date'),
required=False
)
created_at_date_range_before = serializers.DateField(
label=_('Created before date'),
label=_('Created to date'),
required=False
)
......
......@@ -401,7 +401,7 @@ class ReportTransaction(ReportAPIView):
filename = '{}.xlsx'.format(_( # pylint: disable=no-member
'Transaction Report from {date_from} to {date_to}'
).format(
date_from=query_params.get('created_at_date_range_after', '*'),
date_from=query_params.get('created_at_date_range_after', '_'),
date_to=query_params.get('created_at_date_range_before', str(timezone.now())[:10])
))
return filename
......@@ -416,7 +416,7 @@ class ReportProgramDonation(ReportAPIView):
filename = '{}.xlsx'.format(_( # pylint: disable=no-member
'Program Donation Report from {date_from} to {date_to}'
).format(
date_from=query_params.get('created_at_date_range_after', '*'),
date_from=query_params.get('created_at_date_range_after', '_'),
date_to=query_params.get('created_at_date_range_before', str(timezone.now())[:10])
))
return filename
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-06 02:41+0700\n"
"POT-Creation-Date: 2020-06-07 04:18+0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -656,12 +656,12 @@ msgid "Program donasi"
msgstr "Donasi program"
#: api/serializers.py:105 api/serializers.py:116
msgid "Created after date"
msgstr "Dibuat setelah tanggal"
msgid "Created from date"
msgstr "Dibuat dari tanggal"
#: api/serializers.py:109 api/serializers.py:120
msgid "Created before date"
msgstr "Dibuat sebelum tanggal"
msgid "Created to date"
msgstr "Dibuat hingga tanggal"
#: api/serializers.py:240
msgid "Stock cannot be empty if it is not a pre-order."
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment