From 358c25b3c052a63a47c7d6443886d5431eaf8851 Mon Sep 17 00:00:00 2001
From: Oscar Martinez Valero <oscar.mart@gmail.com>
Date: Fri, 26 Apr 2024 17:23:16 +0200
Subject: [PATCH] Refactor M.pq and M_Creator.py files

---
 Functions/Date/CountMonths.pq | 24 +++---------------------
 M.pq                          |  6 ++----
 M_Creator.py                  | 15 +++++++++++----
 3 files changed, 16 insertions(+), 29 deletions(-)

diff --git a/Functions/Date/CountMonths.pq b/Functions/Date/CountMonths.pq
index f49a810..dbec381 100644
--- a/Functions/Date/CountMonths.pq
+++ b/Functions/Date/CountMonths.pq
@@ -1,4 +1,3 @@
-let pq_custom_function =
 
 let
     // Define metadata for the function, describing its purpose and usage.
@@ -27,7 +26,6 @@ let
         ])
     ) as list meta [
         Documentation.Name = "fnCountMonths",
-        
         Documentation.LongDescription = 
         "    
                 <p><b>  Count Months Between Dates  </b></p>
@@ -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>
 
@@ -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(
@@ -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)
diff --git a/M.pq b/M.pq
index 3681f30..f6efc69 100644
--- a/M.pq
+++ b/M.pq
@@ -1,5 +1,3 @@
-
-
 let
 
     GitHubUser = "OscarValerock",
@@ -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"
diff --git a/M_Creator.py b/M_Creator.py
index 272d48f..4ddcf65 100644
--- a/M_Creator.py
+++ b/M_Creator.py
@@ -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',
@@ -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'
@@ -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):
     """
@@ -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)
\ No newline at end of file