Skip to content

Commit

Permalink
Refactor M.pq and M_Creator.py files
Browse files Browse the repository at this point in the history
  • Loading branch information
OscarValerock committed Apr 26, 2024
1 parent ed11696 commit 358c25b
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 29 deletions.
24 changes: 3 additions & 21 deletions Functions/Date/CountMonths.pq
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
let pq_custom_function =

let
// Define metadata for the function, describing its purpose and usage.
Expand Down Expand Up @@ -27,7 +26,6 @@ let
])
) as list meta [
Documentation.Name = "fnCountMonths",

Documentation.LongDescription =
"
<p><b> Count Months Between Dates </b></p>
Expand All @@ -36,14 +34,6 @@ let

<li><b> Creator: </b> Imran Haq </li>
<li><b> Web: </b> https://github.com/PBIQueryous </li>
<li><b> Acknowledgements: </b> </li>
<li><b> LinkedIn: </b> </li>

<li>------------------------------------------------------</li>

<li><b> Editor: </b> Oscar Martinez </li>
<li><b> Web: </b> https://bibb.pro </li>
<li><b> LinkedIn: </b> https://www.linkedin.com/in/oscarmartinezv/ </li>

<li>------------------------------------------------------</li>

Expand All @@ -70,9 +60,6 @@ let

myFunction = (StartDate as date, EndDate as date, optional CompletedMonthsOnly as nullable logical) =>

let invoke_custom_function =
// paste your custom function here
// _______________________________
let
countWholeMonths = if (CompletedMonthsOnly ?? true) = true then -1 else 0,
MonthsList = List.Generate(
Expand All @@ -84,12 +71,7 @@ myFunction = (StartDate as date, EndDate as date, optional CompletedMonthsOnly a
MonthsCount = Int64.From(List.Count(MonthsList))
in
MonthsCount
// _______________________________
in invoke_custom_function,

replaceMetaData = Value.ReplaceType(myFunction, metaDocumentation)

in
replaceMetaData


in
pq_custom_function
Value.ReplaceType(myFunction, metaDocumentation)
6 changes: 2 additions & 4 deletions M.pq
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


let

GitHubUser = "OscarValerock",
Expand Down Expand Up @@ -244,6 +242,6 @@ let
}
),
#"Merged Columns" = Table.CombineColumns(#"Get PQ functions",{"Type","Path"},Combiner.CombineTextByDelimiter(".", QuoteStyle.None),"Name"),
#"Renamed Columns" = Record.FromTable(Table.RenameColumns(#"Merged Columns",{{"url", "Value"}}))
#"ConvertToRecords" = Record.FromTable(Table.RenameColumns(#"Merged Columns",{{"url", "Value"}}))
in
#"Renamed Columns"
#"ConvertToRecords"
15 changes: 11 additions & 4 deletions M_Creator.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,20 @@
'community.fabric',
'Date.Today',
'Documentation.Author',
'Documentation.Category',
'Documentation.Description',
'Documentation.FieldDescription',
'Documentation.AllowedValues',
'Documentation.Examples',
'Documentation.FieldCaption',
'Documentation.LongDescription',
'Documentation.Name',
'Documentation.SampleValues',
'Documentation.Source',
'Documentation.Version',
'Formatting.IsCode',
'Formatting.IsMultiLine',
'github.com',
'gorilla.bi',
'List.DotProduct',
'List.Flatten',
Expand All @@ -33,6 +40,7 @@
'Web.Contents', #Unfortunately adding this function to the M code will create a dynamic error :(
'www.linkedin',
'youtu.be',
'www.youtube'
]
manual_strings = [
'Number.Abs'
Expand Down Expand Up @@ -138,9 +146,9 @@
}
),
#"Merged Columns" = Table.CombineColumns(#"Get PQ functions",{"Type","Path"},Combiner.CombineTextByDelimiter(".", QuoteStyle.None),"Name"),
#"Renamed Columns" = Record.FromTable(Table.RenameColumns(#"Merged Columns",{{"url", "Value"}}))
#"ConvertToRecords" = Record.FromTable(Table.RenameColumns(#"Merged Columns",{{"url", "Value"}}))
in
#"Renamed Columns"
#"ConvertToRecords"
"""
def process_file(file_path):
"""
Expand Down Expand Up @@ -203,5 +211,4 @@ def process_directory(directory):

print(M_Code)
with open('M.pq', 'w') as file:
file.write(M_Code)

file.write(M_Code)

0 comments on commit 358c25b

Please sign in to comment.