refactoring

This commit is contained in:
frankknoll
2022-02-05 20:46:16 +01:00
parent 41a3c2ed3d
commit 55af50cb0f

View File

@@ -261,19 +261,20 @@
" \n", " \n",
" @staticmethod\n", " @staticmethod\n",
" def getDoseTable(dataFrame):\n", " def getDoseTable(dataFrame):\n",
" filteredDataFrame = DataFrameFilter(dataFrame).filterByCovid19And()\n",
" return DoseAnalysis._getDoseTable(\n", " return DoseAnalysis._getDoseTable(\n",
" dataFrame.groupby(\n", " filteredDataFrame.groupby(\n",
" dataFrame['VAX_DOSE_SERIES'].rename('Dose')))\n", " filteredDataFrame['VAX_DOSE_SERIES'].rename('Dose')))\n",
"\n", "\n",
" @staticmethod\n", " @staticmethod\n",
" def getDoseByMonthTable(dataFrame):\n", " def getDoseByMonthTable(dataFrame):\n",
" # https://stackoverflow.com/questions/61879166/pandas-groupby-month-and-year-date-as-datetime64ns-and-summarized-by-count\n", " filteredDataFrame = DataFrameFilter(dataFrame).filterByCovid19And()\n",
" return DoseAnalysis._getDoseTable(\n", " return DoseAnalysis._getDoseTable(\n",
" dataFrame.groupby(\n", " filteredDataFrame.groupby(\n",
" [\n", " [\n",
" dataFrame['RECVDATE'].dt.year.rename('Year'),\n", " filteredDataFrame['RECVDATE'].dt.year.rename('Year'),\n",
" dataFrame['RECVDATE'].dt.month.rename('Month'),\n", " filteredDataFrame['RECVDATE'].dt.month.rename('Month'),\n",
" dataFrame['VAX_DOSE_SERIES'].rename('Dose')\n", " filteredDataFrame['VAX_DOSE_SERIES'].rename('Dose')\n",
" ]))\n", " ]))\n",
"\n", "\n",
" @staticmethod\n", " @staticmethod\n",